Moodle release 2.0.7

Credit goes to Ralf Hilgenstock.

.gitignore

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

admin/blocks.php

@@ -12,6 +12,8 @@
     $hide     = optional_param('hide', 0, PARAM_INT);
     $show     = optional_param('show', 0, PARAM_INT);
     $delete   = optional_param('delete', 0, PARAM_INT);
+    $unprotect = optional_param('unprotect', 0, PARAM_INT);
+    $protect = optional_param('protect', 0, PARAM_INT);
 
 /// Print headings
 
@@ -24,6 +26,9 @@
     $strcourses = get_string('blockinstances', 'admin');
     $strname = get_string('name');
     $strshowblockcourse = get_string('showblockcourse');
+    $strprotecthdr = get_string('blockprotect', 'admin'). $OUTPUT->help_icon('blockprotect','admin');
+    $strprotect = get_string('blockprotect', 'admin');
+    $strunprotect = get_string('blockunprotect', 'admin');
 
 /// If data submitted, then process and store.
 
@@ -43,6 +48,36 @@
         admin_get_root(true, false);  // settings not required - only pages
     }
 
+    if (!isset($CFG->undeletableblocktypes) || (!is_array($CFG->undeletableblocktypes) && !is_string($CFG->undeletableblocktypes))) {
+        $undeletableblocktypes = array('navigation', 'settings');
+    } else if (is_string($CFG->undeletableblocktypes)) {
+        $undeletableblocktypes = explode(',', $CFG->undeletableblocktypes);
+    } else {
+        $undeletableblocktypes = $CFG->undeletableblocktypes;
+    }
+
+    if (!empty($protect) && confirm_sesskey()) {
+        if (!$block = $DB->get_record('block', array('id'=>$protect))) {
+            print_error('blockdoesnotexist', 'error');
+        }
+        if (!in_array($block->name, $undeletableblocktypes)) {
+            $undeletableblocktypes[] = $block->name;
+            set_config('undeletableblocktypes', implode(',', $undeletableblocktypes));
+        }
+        admin_get_root(true, false);  // settings not required - only pages
+    }
+
+    if (!empty($unprotect) && confirm_sesskey()) {
+        if (!$block = $DB->get_record('block', array('id'=>$unprotect))) {
+            print_error('blockdoesnotexist', 'error');
+        }
+        if (in_array($block->name, $undeletableblocktypes)) {
+            $undeletableblocktypes = array_diff($undeletableblocktypes, array($block->name));
+            set_config('undeletableblocktypes', implode(',', $undeletableblocktypes));
+        }
+        admin_get_root(true, false);  // settings not required - only pages
+    }
+
     if (!empty($delete) && confirm_sesskey()) {
         echo $OUTPUT->header();
         echo $OUTPUT->heading($strmanageblocks);
@@ -114,11 +149,12 @@
 
     $table = new flexible_table('admin-blocks-compatible');
 
-    $table->define_columns(array('name', 'instances', 'version', 'hideshow', 'delete', 'settings'));
-    $table->define_headers(array($strname, $strcourses, $strversion, $strhide.'/'.$strshow, $strdelete, $strsettings));
+    $table->define_columns(array('name', 'instances', 'version', 'hideshow', 'undeletable', 'delete', 'settings'));
+    $table->define_headers(array($strname, $strcourses, $strversion, $strhide.'/'.$strshow, $strprotecthdr, $strdelete, $strsettings));
     $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/blocks.php');
     $table->set_attribute('class', 'compatibleblockstable blockstable generaltable');
     $table->setup();
+    $tablerows = array();
 
     foreach ($blocks as $blockid=>$block) {
         $blockname = $block->name;
@@ -147,7 +183,11 @@
 
         $settings = ''; // By default, no configuration
         if ($blockobject and $blockobject->has_config()) {
-            if (file_exists($CFG->dirroot.'/blocks/'.$block->name.'/settings.php')) {
+            $blocksettings = admin_get_root()->locate('blocksetting' . $block->name);
+
+            if ($blocksettings instanceof admin_externalpage) {
+                $settings = '<a href="' . $blocksettings->url .  '">' . get_string('settings') . '</a>';
+            } else if ($blocksettings instanceof admin_settingpage) {
                 $settings = '<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section=blocksetting'.$block->name.'">'.$strsettings.'</a>';
             } else {
                 $settings = '<a href="block.php?block='.$blockid.'">'.$strsettings.'</a>';
@@ -187,15 +227,32 @@
             $version = "$block->version ($plugin->version)";
         }
 
+        if (!$blockobject) {
+            // ignore
+            $undeletable = '';
+        } else if (in_array($blockname, $undeletableblocktypes)) {
+            $undeletable = '<a href="blocks.php?unprotect='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strunprotect.'">'.
+                       '<img src="'.$OUTPUT->pix_url('t/unlock') . '" class="icon" alt="'.$strunprotect.'" /></a>';
+        } else {
+            $undeletable = '<a href="blocks.php?protect='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strprotect.'">'.
+                       '<img src="'.$OUTPUT->pix_url('t/unlock_gray') . '" class="icon" alt="'.$strprotect.'" /></a>';
+        }
 
-        $table->add_data(array(
+        $row = array(
             '<span'.$class.'>'.$strblockname.'</span>',
             $blocklist,
             '<span'.$class.'>'.$version.'</span>',
             $visible,
+            $undeletable,
             $delete,
             $settings
-        ));
+        );
+        $tablerows[] = array(strip_tags($strblockname), $row); // first element will be used for sorting
+    }
+
+    textlib_get_instance()->asort($tablerows);
+    foreach ($tablerows as $row) {
+        $table->add_data($row[1]);
     }
 
     $table->print_html();

admin/bloglevelupgrade.php

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

admin/cli/automated_backups.php

@@ -0,0 +1,100 @@
+<?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/>.
+
+/**
+ * Automated backups CLI cron
+ *
+ * This script executes
+ *
+ * @package    core
+ * @subpackage cli
+ * @copyright  2010 Sam Hemelryk
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+define('CLI_SCRIPT', true);
+
+require(dirname(dirname(dirname(__FILE__))).'/config.php');
+require_once($CFG->libdir.'/clilib.php');      // cli only functions
+require_once($CFG->libdir.'/cronlib.php');
+
+// now get cli options
+list($options, $unrecognized) = cli_get_params(array('help'=>false),
+                                               array('h'=>'help'));
+
+if ($unrecognized) {
+    $unrecognized = implode("\n  ", $unrecognized);
+    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
+}
+
+if ($options['help']) {
+    $help =
+"Execute automated backups.
+
+This script executes automated backups completely and is designed to be
+called via cron.
+
+Options:
+-h, --help            Print out this help
+
+Example:
+\$sudo -u www-data /usr/bin/php admin/cli/automated_backups.php
+";
+
+    echo $help;
+    die;
+}
+if (CLI_MAINTENANCE) {
+    echo "CLI maintenance mode active, backup execution suspended.\n";
+    exit(1);
+}
+
+if (moodle_needs_upgrading()) {
+    echo "Moodle upgrade pending, backup execution suspended.\n";
+    exit(1);
+}
+
+require_once($CFG->libdir.'/adminlib.php');
+require_once($CFG->libdir.'/gradelib.php');
+
+if (!empty($CFG->showcronsql)) {
+    $DB->set_debug(true);
+}
+if (!empty($CFG->showcrondebugging)) {
+    $CFG->debug = DEBUG_DEVELOPER;
+    $CFG->debugdisplay = true;
+}
+
+$starttime = microtime();
+
+/// emulate normal session
+cron_setup_user();
+
+/// Start output log
+$timenow = time();
+
+mtrace("Server Time: ".date('r',$timenow)."\n\n");
+
+// Run automated backups if required.
+require_once($CFG->dirroot.'/backup/util/includes/backup_includes.php');
+require_once($CFG->dirroot.'/backup/util/helper/backup_cron_helper.class.php');
+backup_cron_automated_helper::run_automated_backup(backup_cron_automated_helper::RUN_IMMEDIATELY);
+
+mtrace("Automated cron backups completed correctly");
+
+$difftime = microtime_diff($starttime, microtime());
+mtrace("Execution took ".$difftime." seconds");

admin/cli/install.php

@@ -61,6 +61,8 @@ Options:
 --dbpass=PASSWORD     Database password. Default is blank
 --dbsocket            Use database sockets. Available for some databases only.
 --prefix=STRING       Table prefix for above database tables. Default is mdl_
+--fullname=STRING     The fullname of the site
+--shortname=STRING    The shortname of the site
 --adminuser=USERNAME  Username for the moodle admin account. Default is admin
 --adminpass=PASSWORD  Password for the moodle admin account,
                       required in non-interactive mode.
@@ -68,6 +70,8 @@ Options:
                       problem encountered.
 --agree-license       Indicates agreement with software license,
                       required in non-interactive mode.
+--allow-unstable      Install even if the version is not marked as stable yet,
+                      required in non-interactive mode.
 -h, --help            Print out this help
 
 Example:
@@ -134,9 +138,6 @@ $CFG->early_install_lang   = true;
 $parts = explode('/', str_replace('\\', '/', dirname(dirname(__FILE__))));
 $CFG->admin                = array_pop($parts);
 
-require($CFG->dirroot.'/version.php');
-$CFG->target_release = $release;
-
 //point pear include path to moodles lib/pear so that includes and requires will search there for files before anywhere else
 //the problem is that we need specific version of quickforms and hacked excel files :-(
 ini_set('include_path', $CFG->libdir.'/pear' . PATH_SEPARATOR . ini_get('include_path'));
@@ -152,6 +153,9 @@ require_once($CFG->libdir.'/deprecatedlib.php');
 require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->libdir.'/componentlib.class.php');
 
+require($CFG->dirroot.'/version.php');
+$CFG->target_release = $release;
+
 //Database types
 $databases = array('mysqli' => moodle_database::get_driver_instance('mysqli', 'native'),
                    'pgsql'  => moodle_database::get_driver_instance('pgsql',  'native'),
@@ -185,10 +189,13 @@ list($options, $unrecognized) = cli_get_params(
         'dbpass'            => '',
         'dbsocket'          => false,
         'prefix'            => 'mdl_',
+        'fullname'          => '',
+        'shortname'         => '',
         'adminuser'         => 'admin',
         'adminpass'         => '',
         'non-interactive'   => false,
         'agree-license'     => false,
+        'allow-unstable'    => false,
         'help'              => false
     ),
     array(
@@ -227,7 +234,7 @@ if ($interactive) {
     foreach ($languages as $key=>$lang) {
         $c++;
         $length = iconv_strlen($lang, 'UTF-8');
-        $padded = $lang.str_repeat(' ', 28-$length);
+        $padded = $lang.str_repeat(' ', 38-$length);
         $langlist .= $padded;
         if ($c % 3 == 0) {
             $langlist .= "\n";
@@ -258,7 +265,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 {
@@ -398,6 +405,28 @@ $CFG->langotherroot      = $CFG->dataroot.'/lang';
 $CFG->langlocalroot      = $CFG->dataroot.'/lang';
 get_string_manager(true);
 
+// make sure we are installing stable release or require a confirmation
+if (isset($maturity)) {
+    if (($maturity < MATURITY_STABLE) and !$options['allow-unstable']) {
+        $maturitylevel = get_string('maturity'.$maturity, 'admin');
+
+        if ($interactive) {
+            cli_separator();
+            cli_heading(get_string('notice'));
+            echo get_string('maturitycorewarning', 'admin', $maturitylevel) . PHP_EOL;
+            echo get_string('morehelp') . ': ' . get_docs_url('admin/versions') . PHP_EOL;
+            echo get_string('continue') . PHP_EOL;
+            $prompt = get_string('cliyesnoprompt', 'admin');
+            $input = cli_input($prompt, '', array(get_string('clianswerno', 'admin'), get_string('cliansweryes', 'admin')));
+            if ($input == get_string('clianswerno', 'admin')) {
+                exit(1);
+            }
+        } else {
+            cli_error(get_string('maturitycorewarning', 'admin'));
+        }
+    }
+}
+
 // ask for db type - show only drivers available
 if ($interactive) {
     $options['dbtype'] = strtolower($options['dbtype']);
@@ -507,6 +536,48 @@ if ($interactive) {
     }
 }
 
+// ask for fullname
+if ($interactive) {
+    cli_separator();
+    cli_heading(get_string('fullsitename', 'moodle'));
+
+    if ($options['fullname'] !== '') {
+        $prompt = get_string('clitypevaluedefault', 'admin', $options['fullname']);
+    } else {
+        $prompt = get_string('clitypevalue', 'admin');
+    }
+
+    do {
+        $options['fullname'] = cli_input($prompt, $options['fullname']);
+    } while (empty($options['fullname']));
+} else {
+    if (empty($options['fullname'])) {
+        $a = (object)array('option'=>'fullname', 'value'=>$options['fullname']);
+        cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
+    }
+}
+
+// ask for shortname
+if ($interactive) {
+    cli_separator();
+    cli_heading(get_string('shortsitename', 'moodle'));
+
+    if ($options['shortname'] !== '') {
+        $prompt = get_string('clitypevaluedefault', 'admin', $options['shortname']);
+    } else {
+        $prompt = get_string('clitypevalue', 'admin');
+    }
+
+    do {
+        $options['shortname'] = cli_input($prompt, $options['shortname']);
+    } while (empty($options['shortname']));
+} else {
+    if (empty($options['shortname'])) {
+        $a = (object)array('option'=>'shortname', 'value'=>$options['shortname']);
+        cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
+    }
+}
+
 // ask for admin user name
 if ($interactive) {
     cli_separator();

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            Name of the site
+--shortname           Name of the site
 -h, --help            Print out this help
 
 Example:
@@ -85,7 +87,7 @@ if ($DB->get_tables() ) {
 $CFG->early_install_lang = true;
 get_string_manager(true);
 
-@raise_memory_limit('128M');
+raise_memory_limit(MEMORY_EXTRA);
 
 // now get cli options
 list($options, $unrecognized) = cli_get_params(
@@ -93,6 +95,8 @@ list($options, $unrecognized) = cli_get_params(
         'lang'              => 'en',
         'adminuser'         => 'admin',
         'adminpass'         => '',
+        'fullname'          => '',
+        'shortname'         => '',
         'agree-license'     => false,
         'help'              => false
     ),

admin/cli/upgrade.php

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

admin/cron.php

@@ -36,10 +36,17 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+
+if (defined('STDIN')) {
+    fwrite(STDERR, "ERROR: This script no longer supports CLI, please use admin/cli/cron.php instead\n");
+    exit(1);
+}
+
 // This is a fake CLI script, it is a really ugly hack which emulates
 // CLI via web interface, please do not use this hack elsewhere
 define('CLI_SCRIPT', true);
 define('WEB_CRON_EMULATED_CLI', 'defined'); // ugly ugly hack, do not use elsewhere please
+define('NO_OUTPUT_BUFFERING', true);
 
 require('../config.php');
 require_once($CFG->libdir.'/clilib.php');
@@ -74,12 +81,6 @@ if (check_browser_version('MSIE')) {
     @header('Content-Type: text/plain; charset=utf-8');
 }
 
-// no more headers and buffers
-@ob_implicit_flush(true);
-while(ob_get_level()) {
-    ob_end_clean();
-}
-
 // execute the cron
 cron_run();
 

admin/dbtransfer/lib.php

@@ -26,7 +26,7 @@ function dbtransfer_export_xml_database($description, $mdb) {
 
     session_get_instance()->write_close(); // release session
 
-    header('Content-Type: application/xhtml+xml');
+    header('Content-Type: application/xhtml+xml; charset=utf-8');
     header('Content-Disposition: attachment; filename=database.xml');
     header('Expires: 0');
     header('Cache-Control: must-revalidate,post-check=0,pre-check=0');

admin/environment.xml

@@ -300,6 +300,8 @@
           <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">
@@ -319,6 +321,353 @@
       </PHP_SETTING>
     </PHP_SETTINGS>
     <CUSTOM_CHECKS>
+      <CUSTOM_CHECK file="lib/customcheckslib.php" function="php_check_php533" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="php533warning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
     </CUSTOM_CHECKS>
   </MOODLE>
+  <MOODLE version="2.1" requires="1.9">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mysql" version="5.0.25">
+        <FEEDBACK>
+          <ON_ERROR message="mysql416required" />
+        </FEEDBACK>
+      </VENDOR>
+      <VENDOR name="postgres" version="8.3" />
+      <VENDOR name="mssql" version="9.0" />
+      <VENDOR name="odbc_mssql" version="9.0" />
+      <VENDOR name="mssql_n" version="9.0" />
+      <VENDOR name="oracle" version="10.2" />
+      <VENDOR name="sqlite" version="2.0" />
+    </DATABASE>
+    <PHP version="5.3.2" level="required">
+    </PHP>
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="required">
+        <FEEDBACK>
+          <ON_CHECK message="iconvrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="mbstring" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="mbstringrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="curl" level="required">
+        <FEEDBACK>
+          <ON_CHECK message="curlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="openssl" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="opensslrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="tokenizer" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="tokenizerrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlrpc" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="xmlrpcrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="soap" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="soaprecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="ctype" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ctyperequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zip" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ziprequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="gd" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="gdrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="simplexml" level="required">
+        <FEEDBACK>
+          <ON_CHECK message="simplexmlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="spl" level="required">
+        <FEEDBACK>
+          <ON_CHECK message="splrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="pcre" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="dom" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xml" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="intl" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="intlrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="json" level="required">
+      </PHP_EXTENSION>
+    </PHP_EXTENSIONS>
+    <PHP_SETTINGS>
+      <PHP_SETTING name="memory_limit" value="40M" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="settingmemorylimit" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="safe_mode" value="0" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingsafemode" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="file_uploads" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingfileuploads" />
+        </FEEDBACK>
+      </PHP_SETTING>
+    </PHP_SETTINGS>
+  </MOODLE>
+  <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">
+        <FEEDBACK>
+          <ON_ERROR message="mysql416required" />
+        </FEEDBACK>
+      </VENDOR>
+      <VENDOR name="postgres" version="8.3" />
+      <VENDOR name="mssql" version="9.0" />
+      <VENDOR name="odbc_mssql" version="9.0" />
+      <VENDOR name="mssql_n" version="9.0" />
+      <VENDOR name="oracle" version="10.2" />
+      <VENDOR name="sqlite" version="2.0" />
+    </DATABASE>
+    <PHP version="5.3.2" level="required">
+    </PHP>
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="required">
+        <FEEDBACK>
+          <ON_CHECK message="iconvrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="mbstring" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="mbstringrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="curl" level="required">
+        <FEEDBACK>
+          <ON_CHECK message="curlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="openssl" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="opensslrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="tokenizer" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="tokenizerrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlrpc" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="xmlrpcrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="soap" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="soaprecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="ctype" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ctyperequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zip" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ziprequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="gd" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="gdrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="simplexml" level="required">
+        <FEEDBACK>
+          <ON_CHECK message="simplexmlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="spl" level="required">
+        <FEEDBACK>
+          <ON_CHECK message="splrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="pcre" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="dom" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xml" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="intl" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="intlrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="json" level="required">
+      </PHP_EXTENSION>
+    </PHP_EXTENSIONS>
+    <PHP_SETTINGS>
+      <PHP_SETTING name="memory_limit" value="40M" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="settingmemorylimit" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="safe_mode" value="0" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingsafemode" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="file_uploads" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingfileuploads" />
+        </FEEDBACK>
+      </PHP_SETTING>
+    </PHP_SETTINGS>
+  </MOODLE>
+  <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.0.25">
+        <FEEDBACK>
+          <ON_ERROR message="mysql416required" />
+        </FEEDBACK>
+      </VENDOR>
+      <VENDOR name="postgres" version="8.3" />
+      <VENDOR name="mssql" version="9.0" />
+      <VENDOR name="odbc_mssql" version="9.0" />
+      <VENDOR name="mssql_n" version="9.0" />
+      <VENDOR name="oracle" version="10.2" />
+      <VENDOR name="sqlite" version="2.0" />
+    </DATABASE>
+    <PHP version="5.3.2" level="required">
+    </PHP>
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="required">
+        <FEEDBACK>
+          <ON_CHECK message="iconvrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="mbstring" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="mbstringrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="curl" level="required">
+        <FEEDBACK>
+          <ON_CHECK message="curlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="openssl" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="opensslrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="tokenizer" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="tokenizerrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlrpc" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="xmlrpcrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="soap" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="soaprecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="ctype" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ctyperequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zip" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ziprequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="gd" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="gdrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="simplexml" level="required">
+        <FEEDBACK>
+          <ON_CHECK message="simplexmlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="spl" level="required">
+        <FEEDBACK>
+          <ON_CHECK message="splrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="pcre" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="dom" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xml" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="intl" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="intlrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="json" level="required">
+      </PHP_EXTENSION>
+    </PHP_EXTENSIONS>
+    <PHP_SETTINGS>
+      <PHP_SETTING name="memory_limit" value="40M" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="settingmemorylimit" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="safe_mode" value="0" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingsafemode" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="file_uploads" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingfileuploads" />
+        </FEEDBACK>
+      </PHP_SETTING>
+    </PHP_SETTINGS>
+  </MOODLE>
 </COMPATIBILITY_MATRIX>

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

admin/health.php

@@ -330,7 +330,7 @@ class problem_000008 extends problem_base {
         global $CFG;
 
         $oldmemlimit = @ini_get('memory_limit');
-        if(empty($oldmemlimit)) {
+        if (empty($oldmemlimit)) {
             // PHP not compiled with memory limits, this means that it's
             // probably limited to 8M or in case of Windows not at all.
             // We can ignore it for now - there is not much to test anyway
@@ -338,12 +338,9 @@ class problem_000008 extends problem_base {
             return false;
         }
         $oldmemlimit = get_real_size($oldmemlimit);
-        //now lets change the memory limit to something unique below 128M==134217728
-        if (empty($CFG->extramemorylimit)) {
-            raise_memory_limit('128M');
-        } else {
-            raise_memory_limit($CFG->extramemorylimit);
-        }
+        //now lets change the memory limit to something higher
+        $newmemlimit = ($oldmemlimit + 1024*1024*5);
+        raise_memory_limit($newmemlimit);
         $testmemlimit = get_real_size(@ini_get('memory_limit'));
         //verify the change had any effect at all
         if ($oldmemlimit == $testmemlimit) {

admin/index.php

@@ -38,11 +38,7 @@ if (version_compare(phpversion(), '5.2.0') < 0) {
     die;
 }
 
-// try to flush everything all the time
-@ob_implicit_flush(true);
-while(ob_get_level()) {
-    ob_end_clean(); // ob_end_flush prevents sending of headers
-}
+define('NO_OUTPUT_BUFFERING', true);
 
 require('../config.php');
 require_once($CFG->libdir.'/adminlib.php');    // various admin-only functions
@@ -57,6 +53,7 @@ $agreelicense   = optional_param('agreelicense', 0, PARAM_BOOL);
 // Check some PHP server settings
 
 $PAGE->set_url('/admin/index.php');
+$PAGE->set_pagelayout('admin'); // Set a default pagelayout
 
 $documentationlink = '<a href="http://docs.moodle.org/en/Installation">Installation docs</a>';
 
@@ -89,7 +86,7 @@ if (!isset($CFG->version)) {
 
 $version = null;
 $release = null;
-require("$CFG->dirroot/version.php");       // defines $version and $release
+require("$CFG->dirroot/version.php");       // defines $version, $release and $maturity
 $CFG->target_release = $release;            // used during installation and upgrades
 
 if (!$version or !$release) {
@@ -102,6 +99,7 @@ $CFG->xmlstrictheaders = false;
 
 if (!core_tables_exist()) {
     $PAGE->set_pagelayout('maintenance');
+    $PAGE->set_popup_notification_allowed(false);
 
     // fake some settings
     $CFG->docroot = 'http://docs.moodle.org';
@@ -125,24 +123,36 @@ if (!core_tables_exist()) {
         echo $OUTPUT->box($copyrightnotice, 'copyrightnotice');
         echo '<br />';
         $continue = new single_button(new moodle_url('/admin/index.php', array('lang'=>$CFG->lang, 'agreelicense'=>1)), get_string('continue'), 'get');
-        echo $OUTPUT->confirm(get_string('doyouagree'), $continue, "http://docs.moodle.org/en/License");
+        echo $OUTPUT->confirm(get_string('doyouagree'), $continue, "http://docs.moodle.org/dev/License");
         echo $OUTPUT->footer();
         die;
     }
     if (empty($confirmrelease)) {
         $strcurrentrelease = get_string('currentrelease');
         $PAGE->navbar->add($strcurrentrelease);
-        $PAGE->set_title($strinstallation.' - Moodle '.$CFG->target_release);
-        $PAGE->set_heading($strinstallation);
+        $PAGE->set_title($strinstallation);
+        $PAGE->set_heading($strinstallation . ' - Moodle ' . $CFG->target_release);
         $PAGE->set_cacheable(false);
         echo $OUTPUT->header();
         echo $OUTPUT->heading("Moodle $release");
-        $releasenoteslink = get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/en/Release_Notes');
+
+        if (isset($maturity)) {
+            // main version.php declares moodle code maturity
+            if ($maturity < MATURITY_STABLE) {
+                $maturitylevel = get_string('maturity'.$maturity, 'admin');
+                echo $OUTPUT->box(
+                    $OUTPUT->container(get_string('maturitycorewarning', 'admin', $maturitylevel)) .
+                    $OUTPUT->container($OUTPUT->doc_link('admin/versions', get_string('morehelp'))),
+                    'generalbox maturitywarning');
+            }
+        }
+
+        $releasenoteslink = get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/dev/Releases');
         $releasenoteslink = str_replace('target="_blank"', 'onclick="this.target=\'_blank\'"', $releasenoteslink); // extremely ugly validation hack
-        echo $OUTPUT->box($releasenoteslink, 'generalbox boxaligncenter boxwidthwide');
+        echo $OUTPUT->box($releasenoteslink, 'generalbox releasenoteslink');
 
         require_once($CFG->libdir.'/environmentlib.php');
-        if (!check_moodle_environment($release, $environment_results, true, ENV_SELECT_RELEASE)) {
+        if (!check_moodle_environment(normalize_version($release), $environment_results, true, ENV_SELECT_RELEASE)) {
             print_upgrade_reload("index.php?agreelicense=1&amp;lang=$CFG->lang");
         } else {
             echo $OUTPUT->notification(get_string('environmentok', 'admin'), 'notifysuccess');
@@ -184,17 +194,27 @@ if (empty($CFG->version)) {
 
 if ($version > $CFG->version) {  // upgrade
     $PAGE->set_pagelayout('maintenance');
+    $PAGE->set_popup_notification_allowed(false);
 
     $a->oldversion = "$CFG->release ($CFG->version)";
     $a->newversion = "$release ($version)";
     $strdatabasechecking = get_string('databasechecking', '', $a);
 
     if (empty($confirmupgrade)) {
-        $PAGE->navbar->add($strdatabasechecking);
-        $PAGE->set_title($strdatabasechecking);
-        $PAGE->set_heading($stradministration);
+        $PAGE->set_title($stradministration);
+        $PAGE->set_heading($strdatabasechecking);
         $PAGE->set_cacheable(false);
         echo $OUTPUT->header();
+        if (isset($maturity)) {
+            // main version.php declares moodle code maturity
+            if ($maturity < MATURITY_STABLE) {
+                $maturitylevel = get_string('maturity'.$maturity, 'admin');
+                echo $OUTPUT->box(
+                    $OUTPUT->container(get_string('maturitycorewarning', 'admin', $maturitylevel)) .
+                    $OUTPUT->container($OUTPUT->doc_link('admin/versions', get_string('morehelp'))),
+                    'generalbox maturitywarning');
+}
+        }
         $continueurl = new moodle_url('index.php', array('confirmupgrade' => 1));
         $cancelurl = new moodle_url('index.php');
         echo $OUTPUT->confirm(get_string('upgradesure', 'admin', $a->newversion), $continueurl, $cancelurl);
@@ -209,7 +229,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);
 
@@ -267,6 +287,7 @@ if (moodle_needs_upgrading()) {
         // means core upgrade or installation was not already done
         if (!$confirmplugins) {
             $PAGE->set_pagelayout('maintenance');
+            $PAGE->set_popup_notification_allowed(false);
             $strplugincheck = get_string('plugincheck');
             $PAGE->navbar->add($strplugincheck);
             $PAGE->set_title($strplugincheck);
@@ -419,10 +440,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/langimport.php

@@ -53,11 +53,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();

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/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'));
@@ -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) {
@@ -96,15 +99,6 @@ 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');
-        }
-
         // finished with form controls, now the static informational stuff
         if ($mnet_peer && !empty($mnet_peer->bootstrapped)) {
             $expires = '';
@@ -140,7 +134,19 @@ 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

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/services_form.php

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

admin/modules.php

@@ -141,12 +141,17 @@
             $settings = "";
         }
 
-        $count = $DB->count_records_select($module->name, "course<>0");
+        try {
+            $count = $DB->count_records_select($module->name, "course<>0");
+        } catch (dml_exception $e) {
+            $count = -1;
+        }
         if ($count>0) {
             $countlink = "<a href=\"{$CFG->wwwroot}/course/search.php?modulelist=$module->name" .
                 "&amp;sesskey=".sesskey()."\" title=\"$strshowmodulecourse\">$count</a>";
-        }
-        else {
+        } else if ($count < 0) {
+            $countlink = get_string('error');
+        } else {
             $countlink = "$count";
         }
 

admin/multilangupgrade.php

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

admin/portfolio.php

@@ -11,7 +11,7 @@ $sure          = optional_param('sure', '', PARAM_ALPHA);
 
 $display = true; // fall through to normal display
 
-$pagename = 'portfoliocontroller';
+$pagename = 'manageportfolios';
 
 if ($action == 'edit') {
     $pagename = 'portfoliosettings' . $portfolio;
@@ -37,12 +37,21 @@ admin_externalpage_setup($pagename);
 
 require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
 
-$baseurl    = "$CFG->wwwroot/$CFG->admin/settings.php?section=manageportfolios";
+$baseurl    = "$CFG->wwwroot/$CFG->admin/portfolio.php";
 $sesskeyurl = "$CFG->wwwroot/$CFG->admin/portfolio.php?sesskey=" . sesskey();
 $configstr  = get_string('manageportfolios', 'portfolio');
 
 $return = true; // direct back to the main page
 
+/**
+ * Helper function that generates a moodle_url object
+ * relevant to the portfolio
+ */
+function portfolio_action_url($portfolio) {
+    global $baseurl;
+    return new moodle_url($baseurl, array('sesskey'=>sesskey(), 'pf'=>$portfolio));
+}
+
 if (($action == 'edit') || ($action == 'new')) {
     if (($action == 'edit')) {
         $instance = portfolio_instance($portfolio);
@@ -126,11 +135,113 @@ if (($action == 'edit') || ($action == 'new')) {
         echo $OUTPUT->confirm(get_string('sure', 'portfolio', $instance->get('name')), $sesskeyurl . '&pf='.$portfolio.'&action=delete&sure=yes', $baseurl);
         $return = false;
     }
+} else {
+    // If page is loaded directly
+    echo $OUTPUT->header();
+    echo $OUTPUT->heading(get_string('manageportfolios', 'portfolio'));
+
+    // Get strings that are used
+    $strshow = get_string('on', 'portfolio');
+    $strhide = get_string('off', 'portfolio');
+    $strdelete = get_string('disabledinstance', 'portfolio');
+    $strsettings = get_string('settings');
+
+    $actionchoicesforexisting = array(
+        'show' => $strshow,
+        'hide' => $strhide,
+        'delete' => $strdelete
+    );
+
+    $actionchoicesfornew = array(
+        'newon' => $strshow,
+        'newoff' => $strhide,
+        'delete' => $strdelete
+    );
+
+    $output = $OUTPUT->box_start('generalbox');
+
+    $plugins = get_plugin_list('portfolio');
+    $plugins = array_keys($plugins);
+    $instances = portfolio_instances(false, false);
+    $usedplugins = array();
+
+    // to avoid notifications being sent out while admin is editing the page
+    define('ADMIN_EDITING_PORTFOLIO', true);
+
+    $insane = portfolio_plugin_sanity_check($plugins);
+    $insaneinstances = portfolio_instance_sanity_check($instances);
+
+    $table = new html_table();
+    $table->head = array(get_string('plugin', 'portfolio'), '', '');
+    $table->data = array();
+
+    foreach ($instances as $i) {
+        $settings = '<a href="' . $sesskeyurl . '&amp;action=edit&amp;pf=' . $i->get('id') . '">' . $strsettings .'</a>';
+        // Set some commonly used variables
+        $pluginid = $i->get('id');
+        $plugin = $i->get('plugin');
+        $pluginname = $i->get('name');
+
+        // Check if the instance is misconfigured
+        if (array_key_exists($plugin, $insane) || array_key_exists($pluginid, $insaneinstances)) {
+            if (!empty($insane[$plugin])) {
+                $information = $insane[$plugin];
+            } else if (!empty($insaneinstances[$pluginid])) {
+                $information = $insaneinstances[$pluginid];
+            }
+            $table->data[] = array($pluginname, $strdelete  . " " . $OUTPUT->help_icon($information, 'portfolio_' .  $plugin), $settings);
+        } else {
+            if ($i->get('visible')) {
+                $currentaction = 'show';
+            } else {
+                $currentaction = 'hide';
+            }
+            $select = new single_select(portfolio_action_url($pluginid, 'pf'), 'action', $actionchoicesforexisting, $currentaction, null, 'applyto' . $pluginid);
+            $table->data[] = array($pluginname, $OUTPUT->render($select), $settings);
+        }
+        if (!in_array($plugin, $usedplugins)) {
+            $usedplugins[] = $plugin;
+        }
+    }
+
+    // Create insane plugin array
+    $insaneplugins = array();
+    if (!empty($plugins)) {
+        foreach ($plugins as $p) {
+            // Check if it can not have multiple instances and has already been used
+            if (!portfolio_static_function($p, 'allows_multiple_instances') && in_array($p, $usedplugins)) {
+                continue;
+            }
+
+            // Check if it is misconfigured - if so store in array then display later
+            if (array_key_exists($p, $insane)) {
+                $insaneplugins[] = $p;
+            } else {
+                $select = new single_select(portfolio_action_url($p, 'pf'), 'action', $actionchoicesfornew, 'delete', null, 'applyto' . $p);
+                $table->data[] = array(portfolio_static_function($p, 'get_name'), $OUTPUT->render($select), '');
+            }
+        }
+    }
+
+    // Loop through all the insane plugins
+    if (!empty($insaneplugins)) {
+        foreach ($insaneplugins as $p) {
+            $table->data[] = array(portfolio_static_function($p, 'get_name'), $strdelete . " " . $OUTPUT->help_icon($insane[$p], 'portfolio_' .  $p), '');
+        }
+    }
+
+    $output .= html_writer::table($table);
+
+    $output .= $OUTPUT->box_end();
+
+    echo $output;
+    $return = false;
 }
 
-if (!empty($return)) {
-    // normal display. fall through to here (don't call exit) if you want this to run
+if ($return) {
+    // Redirect to base
     redirect($baseurl);
 }
+
 echo $OUTPUT->footer();
 

admin/purgecaches.php

@@ -33,23 +33,31 @@ admin_externalpage_setup('purgecaches');
 require_login();
 require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
 
-$return = new moodle_url('/');
-if (isset($_SERVER['HTTP_REFERER']) and !empty($_SERVER['HTTP_REFERER'])) {
-    if ($_SERVER['HTTP_REFERER'] !== "$CFG->wwwroot/$CFG->admin/purgecaches.php") {
-        $return = $_SERVER['HTTP_REFERER'];
-    }
-}
-
 if ($confirm) {
     require_sesskey();
+
+    // Valid request. Purge, and redisplay the form so it is easy to purge again
+    // in the near future.
     purge_all_caches();
-    redirect($return, get_string('purgecachesfinished', 'admin'));
+    redirect(new moodle_url('/admin/purgecaches.php'), get_string('purgecachesfinished', 'admin'));
+
 } else {
+    // Show a confirm form.
     echo $OUTPUT->header();
     echo $OUTPUT->heading(get_string('purgecaches', 'admin'));
 
     $url = new moodle_url('/admin/purgecaches.php', array('sesskey'=>sesskey(), 'confirm'=>1));
-    echo $OUTPUT->confirm(get_string('purgecachesconfirm', 'admin'), $url, $return);
+    $button = new single_button($url, get_string('purgecaches','admin'), 'post');
 
+    // Cancel button takes them back to the page the were on, if possible,
+    // otherwise to the site home page.
+    $return = new moodle_url('/');
+    if (isset($_SERVER['HTTP_REFERER']) and !empty($_SERVER['HTTP_REFERER'])) {
+        if ($_SERVER['HTTP_REFERER'] !== "$CFG->wwwroot/$CFG->admin/purgecaches.php") {
+            $return = $_SERVER['HTTP_REFERER'];
+        }
+    }
+
+    echo $OUTPUT->confirm(get_string('purgecachesconfirm', 'admin'), $button, $return);
     echo $OUTPUT->footer();
 }

admin/qtypes.php

@@ -1,289 +1,308 @@
 <?php
-// Allows the admin to manage question types.
+// 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/>.
 
-    require_once(dirname(__FILE__) . '/../config.php');
-    require_once($CFG->libdir . '/questionlib.php');
-    require_once($CFG->libdir . '/adminlib.php');
-    require_once($CFG->libdir . '/tablelib.php');
+/**
+ * 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
+ */
 
-/// 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');
+require_once(dirname(__FILE__) . '/../config.php');
+require_once($CFG->libdir . '/questionlib.php');
+require_once($CFG->libdir . '/adminlib.php');
+require_once($CFG->libdir . '/tablelib.php');
 
-/// 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;
+// 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');
+
+// 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_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', 'admin', $thispageurl);
+    }
 
+    if (!isset($QTYPES[$delete])) {
+        print_error('unknownquestiontype', 'question', $thispageurl, $delete);
+    }
+
+    $qtypename = $QTYPES[$delete]->local_name();
+    if ($counts[$delete]->numquestions + $counts[$delete]->numhidden > 0) {
+        print_error('cannotdeleteqtypeinuse', 'admin', $thispageurl, $qtypename);
+    }
+
+    if ($needed[$delete] > 0) {
+        print_error('cannotdeleteqtypeneeded', 'admin', $thispageurl, $qtypename);
+    }
+
+    // If not yet confirmed, display a confirmation message.
+    if (!optional_param('confirm', '', PARAM_BOOL)) {
         $qtypename = $QTYPES[$delete]->local_name();
-        if ($counts[$delete]->numquestions + $counts[$delete]->numhidden > 0) {
-            print_error('cannotdeleteqtypeinuse', 'admin', admin_url('qtypes.php'), $qtypename);
-        }
-
-        if ($needed[$delete] > 0) {
-            print_error('cannotdeleteqtypeneeded', 'admin', admin_url('qtypes.php'), $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;
-        }
-
-        // Do the deletion.
         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', 'admin', $qtypename));
+        echo $OUTPUT->confirm(get_string('deleteqtypeareyousuremessage', 'admin', $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', 'admin', $qtypename));
 
-/// Set up the table.
-    $table = new flexible_table('qtypeadmintable');
-    $table->define_columns(array('questiontype', 'numquestions', 'version', 'requires',
-            'availableto', 'delete', 'settings'));
-    $table->define_headers(array(get_string('questiontype', 'admin'), get_string('numquestions', 'admin'),
-            get_string('version'), get_string('requires', 'admin'), get_string('availableq', 'question'),
-            get_string('delete'), get_string('settings')));
-    $table->set_attribute('id', 'qtypes');
-    $table->set_attribute('class', 'generaltable generalbox boxaligncenter boxwidthwide');
-    $table->setup();
-
-/// Add a row for each question type.
-    $createabletypes = question_type_menu();
-    foreach ($sortedqtypes as $qtypename => $localname) {
-        $qtype = $QTYPES[$qtypename];
-        $row = array();
-
-        // Question icon and name.
-        $fakequestion = new stdClass;
-        $fakequestion->qtype = $qtypename;
-        $icon = print_question_icon($fakequestion, true);
-        $row[] = $icon . ' ' . $localname;
-
-        // Number of questions of this type.
-        if ($counts[$qtypename]->numquestions + $counts[$qtypename]->numhidden > 0) {
-            if ($counts[$qtypename]->numhidden > 0) {
-                $strcount = get_string('numquestionsandhidden', 'admin', $counts[$qtypename]);
-            } else {
-                $strcount = $counts[$qtypename]->numquestions;
-            }
-            if ($canviewreports) {
-                $row[] = '<a href="' . admin_url('/report/questioninstances/index.php?qtype=' . $qtypename) .
-                        '" title="' . get_string('showdetails', 'admin') . '">' . $strcount . '</a>';
-            } else {
-                $strcount;
-            }
-        } else {
-            $row[] = 0;
-        }
-
-        // Question version number.
-        $version = get_config('qtype_' . $qtypename, 'version');
-        if ($version) {
-            $row[] = $version;
-        } else {
-            $row[] = '<span class="disabled">' . get_string('nodatabase', 'admin') . '</span>';
-        }
-
-        // Other question types required by this one.
-        $requiredtypes = $qtype->requires_qtypes();
-        $strtypes = array();
-        if (!empty($requiredtypes)) {
-            foreach ($requiredtypes as $required) {
-                $strtypes[] = $QTYPES[$required]->local_name();
-            }
-            $row[] = implode(', ', $strtypes);
-        } else {
-            $row[] = '';
-        }
-
-        // Are people allowed to create new questions of this type?
-        $rowclass = '';
-        if ($qtype->menu_name()) {
-            $createable = isset($createabletypes[$qtypename]);
-            $icons = enable_disable_button($qtypename, $createable);
-            if (!$createable) {
-                $rowclass = 'dimmed_text';
-            }
-        } else {
-            $icons = '<img src="' . $OUTPUT->pix_url('spacer') . '" alt="" class="spacer" />';
-        }
-
-        // Move icons.
-        $icons .= icon_html('up', $qtypename, 't/up', get_string('up'), '');
-        $icons .= icon_html('down', $qtypename, 't/down', get_string('down'), '');
-        $row[] = $icons;
-
-        // Delete link, if available.
-        if ($needed[$qtypename]) {
-            $row[] = '';
-        } else {
-            $row[] = '<a href="' . admin_url('qtypes.php?delete=' . $qtypename .
-                    '&amp;sesskey=' . sesskey()) . '" title="' .
-                    get_string('uninstallqtype', 'admin') . '">' . get_string('delete') . '</a>';
-        }
-
-        // Settings link, if available.
-        if (file_exists($qtype->plugin_dir() . '/settings.php')) {
-            $row[] = '<a href="' . admin_url('settings.php?section=qtypesetting' . $qtypename) .
-                    '">' . get_string('settings') . '</a>';
-        } else {
-            $row[] = '';
-        }
-
-        $table->add_data($row, $rowclass);
+    // Delete any configuration records.
+    if (!unset_all_config_for_plugin('qtype_' . $delete)) {
+        echo $OUTPUT->notification(get_string('errordeletingconfig', 'admin', 'qtype_' . $delete));
     }
+    unset_config($delete . '_disabled', 'question');
+    unset_config($delete . '_sortorder', 'question');
 
-    $table->finish_output();
+    // Then the tables themselves
+    drop_plugin_tables($delete, $QTYPES[$delete]->plugin_dir() . '/db/install.xml', false);
 
+    // Remove event handlers and dequeue pending events
+    events_uninstall('qtype/' . $delete);
+
+    $a->qtype = $qtypename;
+    $a->directory = $QTYPES[$delete]->plugin_dir();
+    echo $OUTPUT->box(get_string('qtypedeletefiles', 'admin', $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', '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[] = 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', 'admin')));
+    }
+
+    // Settings link, if available.
+    $settings = admin_get_root()->locate('qtypesetting' . $qtypename);
+    if ($settings instanceof admin_externalpage) {
+        $row[] = html_writer::link($settings->url, get_string('settings'));
+    } else if ($settings instanceof admin_settingpage) {
+        $row[] = html_writer::link(new moodle_url('/admin/settings.php',
+                array('section' => 'qtypesetting' . $qtypename)), get_string('settings'));
+    } else {
+        $row[] = '';
+    }
+
+    $table->add_data($row, $rowclass);
+}
+
+$table->finish_output();
+
+echo $OUTPUT->footer();
+
+function question_types_enable_disable_icons($qtypename, $createable) {
+    if ($createable) {
+        return question_type_icon_html('disable', $qtypename, 'i/hide',
+                get_string('enabled', 'question'), get_string('disable'));
+    } else {
+        return question_type_icon_html('enable', $qtypename, 'i/show',
+                get_string('disabled', 'question'), get_string('enable'));
     }
 }
 
-function icon_html($action, $qtypename, $icon, $alt, $tip) {
+function question_type_icon_html($action, $qtypename, $icon, $alt, $tip) {
     global $OUTPUT;
-    if ($tip) {
-        $tip = 'title="' . $tip . '" ';
-    }
-    $html = ' <form action="' . admin_url('qtypes.php') . '" method="post"><div>';
-    $html .= '<input type="hidden" name="sesskey" value="' . sesskey() . '" />';
-    $html .= '<input type="image" name="' . $action . '" value="' . $qtypename .
-            '" src="' . $OUTPUT->pix_url($icon) . '" alt="' . $alt . '" ' . $tip . '/>';
-    $html .= '</div></form>';
-    return $html;
+    return $OUTPUT->action_icon(new moodle_url('/admin/qtypes.php',
+            array($action => $qtypename, 'sesskey' => sesskey())),
+            new pix_icon($icon, $alt, 'moodle', array('title' => '')),
+            null, array('title' => $tip)) . ' ';
 }
-

admin/registration/confirmregistration.php

@@ -47,7 +47,7 @@ $error = optional_param('error', '', PARAM_ALPHANUM);
 admin_externalpage_setup('registrationindex');
 
 if (!empty($error) and $error == 'urlalreadyexist') {
-    throw new moodle_exception('urlalreadyregistered', 'hub', 
+    throw new moodle_exception('urlalreadyregistered', 'hub',
             $CFG->wwwroot . '/' . $CFG->admin . '/registration/index.php');
 }
 
@@ -65,11 +65,17 @@ if (!empty($registeredhub) and $registeredhub->token == $token) {
     $registeredhub->hubname = $hubname;
     $registrationmanager->update_registeredhub($registeredhub);
 
+    //display notficiation message
     $notificationmessage = $OUTPUT->notification(
             get_string('registrationconfirmedon', 'hub', $hublink), 'notifysuccess');
-
     echo $notificationmessage;
 
+    //display continue button
+    $registrationpage = new moodle_url('/admin/registration/index.php');
+    $continuebutton = $OUTPUT->render(new single_button($registrationpage, get_string('continue', 'hub')));
+    $continuebutton = html_writer::tag('div', $continuebutton, array('class' => 'mdl-align'));
+    echo $continuebutton;
+
     if (!extension_loaded('xmlrpc')) {
         //display notice about xmlrpc
         $xmlrpcnotification = $OUTPUT->doc_link('admin/environment/php_extension/xmlrpc', '');
@@ -79,7 +85,7 @@ if (!empty($registeredhub) and $registeredhub->token == $token) {
 
     echo $OUTPUT->footer();
 } else {
-    throw new moodle_exception('wrongtoken', 'hub', 
+    throw new moodle_exception('wrongtoken', 'hub',
             $CFG->wwwroot . '/' . $CFG->admin . '/registration/index.php');
 }
 

admin/registration/forms.php

@@ -31,8 +31,8 @@
  */
 
 
-require_once($CFG->dirroot . '/lib/formslib.php');
-require_once($CFG->dirroot . '/admin/registration/lib.php');
+require_once($CFG->libdir . '/formslib.php');
+require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');
 
 /**
  * This form display a unregistration form.
@@ -154,8 +154,10 @@ class hub_selector_form extends moodleform {
         $mform->addElement('static', 'or', '', get_string('orenterprivatehub', 'hub'));
 
         //Private hub
-        $mform->addElement('text', 'unlistedurl', get_string('privatehuburl', 'hub'));
-        $mform->addElement('text', 'password', get_string('password'));
+        $mform->addElement('text', 'unlistedurl', get_string('privatehuburl', 'hub'),
+                array('class' => 'registration_textfield'));
+        $mform->addElement('text', 'password', get_string('password'),
+                array('class' => 'registration_textfield'));
 
         $this->add_action_buttons(false, get_string('selecthub', 'hub'));
     }
@@ -227,6 +229,10 @@ class site_registration_form extends moodleform {
         if ($country === false) {
             $country = $admin->country;
         }
+        $language = get_config('hub', 'site_language_' . $cleanhuburl);
+        if ($language === false) {
+            $language = current_language();
+        }
         $geolocation = get_config('hub', 'site_geolocation_' . $cleanhuburl);
         $contactable = get_config('hub', 'site_contactable_' . $cleanhuburl);
         $emailalert = get_config('hub', 'site_emailalert_' . $cleanhuburl);
@@ -277,10 +283,12 @@ class site_registration_form extends moodleform {
         $mform->addHelpButton('urlstring', 'siteurl', 'hub');
 
         $languages = get_string_manager()->get_list_of_languages();
-        $mform->addElement('static', 'langstring', get_string('sitelang', 'hub'), $languages[current_language()]);
-        $mform->addElement('hidden', 'language', current_language());
+        textlib_get_instance()->asort($languages);
+        $mform->addElement('select', 'language', get_string('sitelang', 'hub'),
+                $languages);
         $mform->setType('language', PARAM_ALPHANUMEXT);
-        $mform->addHelpButton('langstring', 'sitelang', 'hub');
+        $mform->addHelpButton('language', 'sitelang', 'hub');
+        $mform->setDefault('language', $language);
 
         $mform->addElement('static', 'versionstring', get_string('siteversion', 'hub'), $CFG->version);
         $mform->addElement('hidden', 'moodleversion', $CFG->version);
@@ -360,8 +368,8 @@ class site_registration_form extends moodleform {
         $questioncount = $DB->count_records('question');
         $resourcecount = $DB->count_records('resource');
         require_once($CFG->dirroot . "/course/lib.php");
-        $participantnumberaverage = average_number_of_participants();
-        $modulenumberaverage = average_number_of_courses_modules();
+        $participantnumberaverage = number_format(average_number_of_participants(), 2);
+        $modulenumberaverage = number_format(average_number_of_courses_modules(), 2);
 
         if (HUB_MOODLEORGHUBURL != $huburl) {
             $mform->addElement('checkbox', 'courses', get_string('sendfollowinginfo', 'hub'),

admin/registration/hubselector.php

@@ -28,7 +28,7 @@
 require('../../config.php');
 
 require_once($CFG->libdir.'/adminlib.php');
-require_once($CFG->dirroot.'/admin/registration/forms.php');
+require_once($CFG->dirroot.'/' . $CFG->admin . '/registration/forms.php');
 
 admin_externalpage_setup('registrationselector');
 
@@ -55,7 +55,7 @@ if (!empty($huburl) and confirm_sesskey()) {
     $hubname = optional_param(clean_param($huburl, PARAM_ALPHANUMEXT), '', PARAM_TEXT);
     $params = array('sesskey' => sesskey(), 'huburl' => $huburl,
             'password' => $password, 'hubname' => $hubname);
-    redirect(new moodle_url($CFG->wwwroot."/admin/registration/register.php",
+    redirect(new moodle_url($CFG->wwwroot."/" . $CFG->admin . "/registration/register.php",
             $params));
 }
 

admin/registration/index.php

@@ -29,8 +29,8 @@
 require('../../config.php');
 
 require_once($CFG->libdir . '/adminlib.php');
-require_once($CFG->dirroot . '/admin/registration/lib.php');
-require_once($CFG->dirroot . '/admin/registration/forms.php');
+require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');
+require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/forms.php');
 require_once($CFG->dirroot . '/course/publish/lib.php');
 require_once($CFG->dirroot . "/webservice/xmlrpc/lib.php");
 
@@ -144,10 +144,15 @@ if (empty($cancel) and $unregistration and !$confirm) {
     }
     $siteunregistrationform->display();
 } else {
-    echo $OUTPUT->heading(get_string('registeron', 'hub'), 3, 'main');
-    echo $renderer->registrationselector();
+    $registeredonmoodleorg = false;
+    $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')) {
         $hubs = $registrationmanager->get_registered_on_hubs();
         if (!empty($hubs)) {

admin/registration/lib.php

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

admin/registration/register.php

@@ -35,34 +35,20 @@
 
 require_once('../../config.php');
 require_once($CFG->libdir . '/adminlib.php');
-require_once($CFG->dirroot . '/admin/registration/forms.php');
+require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/forms.php');
 require_once($CFG->dirroot . '/webservice/lib.php');
-require_once($CFG->dirroot . '/admin/registration/lib.php');
+require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');
 
 admin_externalpage_setup('registrationindex');
 
-$huburl = optional_param('huburl', '', PARAM_URL);
+$huburl = required_param('huburl', PARAM_URL);
+$huburl = rtrim($huburl, "/");
 $password = optional_param('password', '', PARAM_TEXT);
 $hubname = optional_param('hubname', '', PARAM_TEXT);
-if (empty($huburl) or !confirm_sesskey()) {
+if (!confirm_sesskey()) {
     throw new moodle_exception('missingparameter');
 }
 
-/* TO DO
-  if DB config plugin table is not good for dealing with token reference and token confirmation
-  => create other DB table
-  -----------------------------------------------------------------------------
-  Local Type | Token | Local WS | Remote Type | Remote URL        | Confirmed
-  -----------------------------------------------------------------------------
-  HUB        4er4e   server    HUB-DIRECTORY  http...moodle.org      Yes
-  HUB        73j53   client    HUB-DIRECTORY  http...moodle.org      Yes
-  SITE       dfsd7   server    HUB            http...hub             Yes
-  SITE       fd8fd   client    HUB            http...hub             Yes
-  HUB        ds78s   server    SITE           http...site.com        Yes
-  HUB-DIR.   d7d8s   server    HUB            http...hub             Yes
-  -----------------------------------------------------------------------------
- */
-
 $registrationmanager = new registration_manager();
 
 $registeredhub = $registrationmanager->get_registeredhub($huburl);
@@ -86,6 +72,7 @@ if (!empty($fromform) and confirm_sesskey()) {
     set_config('site_address_' . $cleanhuburl, $fromform->address, 'hub');
     set_config('site_region_' . $cleanhuburl, $fromform->regioncode, 'hub');
     set_config('site_country_' . $cleanhuburl, $fromform->countrycode, 'hub');
+    set_config('site_language_' . $cleanhuburl, $fromform->language, 'hub');
     set_config('site_geolocation_' . $cleanhuburl, $fromform->geolocation, 'hub');
     set_config('site_contactable_' . $cleanhuburl, $fromform->contactable, 'hub');
     set_config('site_emailalert_' . $cleanhuburl, $fromform->emailalert, 'hub');
@@ -99,10 +86,8 @@ if (!empty($fromform) and confirm_sesskey()) {
     set_config('site_participantnumberaverage_' . $cleanhuburl, $fromform->participantnumberaverage, 'hub');
 }
 
-/////// UNREGISTER ACTION //////
-//TO DO
-
 /////// UPDATE ACTION ////////
+
 // update the hub registration
 $update = optional_param('update', 0, PARAM_INT);
 if ($update and confirm_sesskey()) {
@@ -132,7 +117,8 @@ if (!empty($fromform) and empty($update) and confirm_sesskey()) {
         if (empty($unconfirmedhub)) {
             //we save the token into the communication table in order to have a reference
             $unconfirmedhub = new stdClass();
-            $unconfirmedhub->token = get_site_identifier();
+            $unconfirmedhub->token = $registrationmanager->get_site_secret_for_hub($huburl);
+            $unconfirmedhub->secret = $unconfirmedhub->token;
             $unconfirmedhub->huburl = $huburl;
             $unconfirmedhub->hubname = $hubname;
             $unconfirmedhub->confirmed = 0;

admin/registration/renderer.php

@@ -45,7 +45,8 @@ class core_register_renderer extends plugin_renderer_base {
     /**
      * Display the page to register on Moodle.org or on a specific hub
      */
-    public function registrationselector() {
+    public function registrationselector($updatemoodleorg = false) {
+        global $CFG;
         $table = new html_table();
         $table->head = array(get_string('moodleorg', 'hub'), get_string('specifichub', 'hub'));
         $table->size = array('50%', '50%');
@@ -66,17 +67,17 @@ class core_register_renderer extends plugin_renderer_base {
         $table->data[] = $row;
 
         //Moodle.org button cell
-        $registeronmoodleorgurl = new moodle_url("/admin/registration/register.php",
+        $registeronmoodleorgurl = new moodle_url("/" . $CFG->admin . "/registration/register.php",
                         array('sesskey' => sesskey(), 'huburl' => HUB_MOODLEORGHUBURL
                             , 'hubname' => 'Moodle.org'));
         $registeronmoodleorgbutton = new single_button($registeronmoodleorgurl,
-                        get_string('registeronmoodleorg', 'hub'));
+                        $updatemoodleorg ? get_string('updatesite', 'hub', 'Moodle.org') : get_string('registeronmoodleorg', 'hub'));
         $registeronmoodleorgbutton->class = 'centeredbutton';
         $registeronmoodleorgbuttonhtml = $this->output->render($registeronmoodleorgbutton);
         $moodleorgcell = $registeronmoodleorgbuttonhtml;
 
         //Specific hub button cell
-        $registeronspecifichuburl = new moodle_url("/admin/registration/hubselector.php",
+        $registeronspecifichuburl = new moodle_url("/" . $CFG->admin . "/registration/hubselector.php",
                         array('sesskey' => sesskey()));
         $registeronspecifichubbutton = new single_button($registeronspecifichuburl,
                         get_string('registeronspecifichub', 'hub'));
@@ -96,15 +97,19 @@ class core_register_renderer extends plugin_renderer_base {
      * Display the listing of registered on hub
      */
     public function registeredonhublisting($hubs) {
+        global $CFG;
         $table = new html_table();
         $table->head = array(get_string('hub', 'hub'), get_string('operation', 'hub'));
         $table->size = array('80%', '20%');
 
         foreach ($hubs as $hub) {
+            if ($hub->huburl == HUB_MOODLEORGHUBURL) {
+                $hub->hubname = get_string('registeredmoodleorg', 'hub', $hub->hubname);
+            }
             $hublink = html_writer::tag('a', $hub->hubname, array('href' => $hub->huburl));
             $hublinkcell = html_writer::tag('div', $hublink, array('class' => 'registeredhubrow'));
 
-            $unregisterhuburl = new moodle_url("/admin/registration/index.php",
+            $unregisterhuburl = new moodle_url("/" . $CFG->admin . "/registration/index.php",
                             array('sesskey' => sesskey(), 'huburl' => $hub->huburl,
                                 'unregistration' => 1));
             $unregisterbutton = new single_button($unregisterhuburl,

admin/registration/renewregistration.php

@@ -0,0 +1,76 @@
+<?php
+
+///////////////////////////////////////////////////////////////////////////
+//                                                                       //
+// This file is part of Moodle - http://moodle.org/                      //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
+//                                                                       //
+// Moodle is free software: you can redistribute it and/or modify        //
+// it under the terms of the GNU General Public License as published by  //
+// the Free Software Foundation, either version 3 of the License, or     //
+// (at your option) any later version.                                   //
+//                                                                       //
+// Moodle is distributed in the hope that it will be useful,             //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
+// GNU General Public License for more details.                          //
+//                                                                       //
+// You should have received a copy of the GNU General Public License     //
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.       //
+//                                                                       //
+///////////////////////////////////////////////////////////////////////////
+
+/*
+ * @package    moodle
+ * @subpackage registration
+ * @author     Jerome Mouneyrac <jerome@mouneyrac.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL
+ * @copyright  (C) 1999 onwards Martin Dougiamas  http://dougiamas.com
+ *
+ * The administrator is redirect to this page from the hub to renew a registration
+ * process because
+ */
+
+require('../../config.php');
+require_once($CFG->libdir . '/adminlib.php');
+require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');
+
+$url = optional_param('url', '', PARAM_URL);
+$hubname = optional_param('hubname', '', PARAM_TEXT);
+$token = optional_param('token', '', PARAM_TEXT);
+
+admin_externalpage_setup('registrationindex');
+
+//check that we are waiting a confirmation from this hub, and check that the token is correct
+$registrationmanager = new registration_manager();
+$registeredhub = $registrationmanager->get_unconfirmedhub($url);
+if (!empty($registeredhub) and $registeredhub->token == $token) {
+
+    echo $OUTPUT->header();
+    echo $OUTPUT->heading(get_string('renewregistration', 'hub'), 3, 'main');
+    $hublink = html_writer::tag('a', $hubname, array('href' => $url));
+
+    $registrationmanager->delete_registeredhub($url);
+
+    //Mooch case, need to recreate the siteidentifier
+    if ($url == HUB_MOODLEORGHUBURL) {
+        $CFG->siteidentifier = null;
+        get_site_identifier();
+    }
+
+    $deletedregmsg = get_string('previousregistrationdeleted', 'hub', $hublink);
+
+    $button = new single_button(new moodle_url('/admin/registration/index.php'),
+                    get_string('restartregistration', 'hub'));
+    $button->class = 'restartregbutton';
+
+    echo html_writer::tag('div', $deletedregmsg . $OUTPUT->render($button),
+            array('class' => 'mdl-align'));
+
+    echo $OUTPUT->footer();
+} else {
+    throw new moodle_exception('wrongtoken', 'hub',
+            $CFG->wwwroot . '/' . $CFG->admin . '/registration/index.php');
+}
+
+

admin/replace.php

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

admin/report/backups/index.php

@@ -7,18 +7,13 @@
 
     $courseid = optional_param('courseid', 0, PARAM_INT);
 
-    admin_externalpage_setup('reportbackups');
+    admin_externalpage_setup('reportbackups', '', null, '', array('pagelayout'=>'report'));
     echo $OUTPUT->header();
 
-/// Scheduled backups are disabled by the server admin
-    if (!empty($CFG->disablescheduledbackups)) {
-        print_error('scheduledbackupsdisabled', 'error');
-    }
-
-/// Scheduled backups aren't active by the site admin
+/// Automated backups aren't active by the site admin
     $backup_config = backup_get_config();
-    if (empty($backup_config->backup_sche_active)) {
-        echo $OUTPUT->notification(get_string('scheduledbackupsinactive'));
+    if (empty($backup_config->backup_auto_active)) {
+        echo $OUTPUT->notification(get_string('automatedbackupsinactive', 'backup'));
     }
 
 /// Get needed strings

admin/report/configlog/index.php

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

admin/report/courseoverview/index.php

@@ -8,9 +8,6 @@
     $time       = optional_param('time', 0, PARAM_INT);
     $numcourses = optional_param('numcourses', 20, PARAM_INT);
 
-    admin_externalpage_setup('reportcourseoverview');
-    echo $OUTPUT->header();
-
     if (empty($CFG->enablestats)) {
         if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM))) {
             redirect("$CFG->wwwroot/$CFG->admin/settings.php?section=stats", get_string('mustenablestats', 'admin'), 3);
@@ -19,6 +16,9 @@
         }
     }
 
+    admin_externalpage_setup('reportcourseoverview', '', null, '', array('pagelayout'=>'report'));
+    echo $OUTPUT->header();
+
     $course = get_site();
     stats_check_uptodate($course->id);
 
@@ -27,9 +27,9 @@
 
     $reportoptions = stats_get_report_options($course->id,STATS_MODE_RANKED);
 
-    $earliestday = $DB->get_field_sql('SELECT timeend FROM {stats_daily} ORDER BY timeend');
-    $earliestweek = $DB->get_field_sql('SELECT timeend FROM {stats_weekly} ORDER BY timeend');
-    $earliestmonth = $DB->get_field_sql('SELECT timeend FROM {stats_monthly} ORDER BY timeend');
+    $earliestday = $DB->get_field_sql('SELECT MIN(timeend) FROM {stats_daily}');
+    $earliestweek = $DB->get_field_sql('SELECT MIN(timeend) FROM {stats_weekly}');
+    $earliestmonth = $DB->get_field_sql('SELECT MIN(timeend) FROM {stats_monthly}');
 
     if (empty($earliestday)) $earliestday = time();
     if (empty($earliestweek)) $earliestweek = time();
@@ -79,13 +79,12 @@
                            $param->extras
                   ORDER BY $param->orderby";
         }
-        //error_log($sql);
 
         $courses = $DB->get_records_sql($sql, $param->params, 0, $numcourses);
 
         if (empty($courses)) {
             echo $OUTPUT->notification(get_string('statsnodata'));
-            echo '</td></tr></table>';echo '<p>after notify</p>';
+            echo '</td></tr></table>';
 
         } else {
             if (empty($CFG->gdversion)) {

admin/report/courseoverview/reportsgraph.php

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

admin/report/customlang/db/install.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<XMLDB PATH="admin/report/customlang/db" VERSION="20100825" 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"
 >
   <TABLES>
-    <TABLE NAME="customlang" COMMENT="Contains the working checkout of all strings and their customization" NEXT="customlang_components">
+    <TABLE NAME="report_customlang" COMMENT="Contains the working checkout of all strings and their customization" NEXT="report_customlang_components">
       <FIELDS>
         <FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" SEQUENCE="true" NEXT="lang"/>
         <FIELD NAME="lang" TYPE="char" LENGTH="20" NOTNULL="true" SEQUENCE="false" COMMENT="The code of the language this string belongs to. Like en, cs or es" PREVIOUS="id" NEXT="componentid"/>
@@ -20,17 +20,17 @@
       </FIELDS>
       <KEYS>
         <KEY NAME="primary" TYPE="primary" FIELDS="id" NEXT="fk_component"/>
-        <KEY NAME="fk_component" TYPE="foreign" FIELDS="componentid" REFTABLE="customlang_components" REFFIELDS="id" PREVIOUS="primary"/>
+        <KEY NAME="fk_component" TYPE="foreign" FIELDS="componentid" REFTABLE="report_customlang_components" REFFIELDS="id" PREVIOUS="primary"/>
       </KEYS>
       <INDEXES>
         <INDEX NAME="uq_lang_component_string" UNIQUE="true" FIELDS="lang, componentid, stringid" COMMENT="For a given language and component, string identifiers must be unique"/>
       </INDEXES>
     </TABLE>
-    <TABLE NAME="customlang_components" COMMENT="Contains the list of all installed plugins that provide their own language pack" PREVIOUS="customlang">
+    <TABLE NAME="report_customlang_components" COMMENT="Contains the list of all installed plugins that provide their own language pack" PREVIOUS="report_customlang">
       <FIELDS>
         <FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" SEQUENCE="true" NEXT="name"/>
         <FIELD NAME="name" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false" COMMENT="The normalized name of the plugin" PREVIOUS="id" NEXT="version"/>
-        <FIELD NAME="version" TYPE="int" LENGTH="10" NOTNULL="false" UNSIGNED="true" SEQUENCE="false" COMMENT="The checked out version of the plugin, null of the version is unknown" PREVIOUS="name"/>
+        <FIELD NAME="version" TYPE="char" LENGTH="255" NOTNULL="false" SEQUENCE="false" COMMENT="The checked out version of the plugin, null if the version is unknown" PREVIOUS="name"/>
       </FIELDS>
       <KEYS>
         <KEY NAME="primary" TYPE="primary" FIELDS="id"/>

admin/report/customlang/db/upgrade.php

@@ -0,0 +1,74 @@
+<?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/>.
+
+/**
+ * Language customization report upgrades
+ *
+ * @package    report
+ * @subpackage customlang
+ * @copyright  2010 David Mudrak <david.mudrak@gmail.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+function xmldb_report_customlang_upgrade($oldversion) {
+    global $CFG, $DB, $OUTPUT;
+
+    $dbman = $DB->get_manager();
+    $result = true;
+
+    /**
+     * Use proper plugin prefix for tables
+     */
+    if ($oldversion < 2010111200) {
+        if ($dbman->table_exists('customlang')) {
+            $dbman->rename_table(new xmldb_table('customlang'), 'report_customlang');
+        }
+        if ($dbman->table_exists('customlang_components')) {
+            $dbman->rename_table(new xmldb_table('customlang_components'), 'report_customlang_components');
+        }
+        upgrade_plugin_savepoint(true, 2010111200, 'report', 'customlang');
+    }
+
+    /**
+     * Regenerate the foreign key after the tables rename
+     */
+    if ($oldversion < 2010111500) {
+        $table = new xmldb_table('report_customlang');
+        $oldkey = new xmldb_key('fk_component', XMLDB_KEY_FOREIGN, array('componentid'), 'customlang_components', array('id'));
+        $newkey = new xmldb_key('fk_component', XMLDB_KEY_FOREIGN, array('componentid'), 'report_customlang_components', array('id'));
+
+        $dbman->drop_key($table, $oldkey);
+        $dbman->add_key($table, $newkey);
+
+        upgrade_plugin_savepoint(true, 2010111500, 'report', 'customlang');
+    }
+
+    /**
+     * Change the version field from integer to varchar
+     */
+    if ($oldversion < 2011041900) {
+        $table = new xmldb_table('report_customlang_components');
+        $field = new xmldb_field('version', XMLDB_TYPE_CHAR, '255', null, null, null, null, 'name');
+
+        $dbman->change_field_type($table, $field);
+
+        upgrade_plugin_savepoint(true, 2011041900, 'report', 'customlang');
+    }
+
+
+    return $result;
+}

admin/report/customlang/edit.php

@@ -29,15 +29,21 @@ require_once($CFG->dirroot.'/'.$CFG->admin.'/report/customlang/filter_form.php')
 require_login(SITEID, false);
 require_capability('report/customlang:edit', get_system_context());
 
+$lng                    = required_param('lng', PARAM_LANG);
 $currentpage            = optional_param('p', 0, PARAM_INT);
 $translatorsubmitted    = optional_param('translatorsubmitted', 0, PARAM_BOOL);
 
 $PAGE->set_pagelayout('standard');
-$PAGE->set_url('/admin/report/customlang/edit.php');
+$PAGE->set_url('/admin/report/customlang/edit.php', array('lng' => $lng));
 navigation_node::override_active_url(new moodle_url('/admin/report/customlang/index.php'));
 $PAGE->set_title(get_string('pluginname', 'report_customlang'));
 $PAGE->set_heading(get_string('pluginname', 'report_customlang'));
-//$PAGE->requires->js_init_call('M.report_customlang.init_translator', array(), true);
+$PAGE->requires->js_init_call('M.report_customlang.init_editor', array(), true);
+
+if (empty($lng)) {
+    // PARAM_LANG validation failed
+    print_error('missingparameter');
+}
 
 // pre-output processing
 $filter     = new report_customlang_filter_form($PAGE->url, null, 'post', '', array('class'=>'filterform'));
@@ -60,13 +66,13 @@ if ($translatorsubmitted) {
     if ($checkin === false) {
         $nexturl = $PAGE->url;
     } else {
-        $nexturl = new moodle_url('/admin/report/customlang/index.php', array('action'=>'checkin', 'sesskey'=>sesskey()));
+        $nexturl = new moodle_url('/admin/report/customlang/index.php', array('action'=>'checkin', 'lng' => $lng, 'sesskey'=>sesskey()));
     }
 
     if (!is_array($strings)) {
         $strings = array();
     }
-    $current = $DB->get_records_list('customlang', 'id', array_keys($strings));
+    $current = $DB->get_records_list('report_customlang', 'id', array_keys($strings));
     $now = time();
 
     foreach ($strings as $recordid => $customization) {
@@ -77,7 +83,7 @@ if ($translatorsubmitted) {
             $current[$recordid]->modified = 1;
             $current[$recordid]->outdated = 0;
             $current[$recordid]->timecustomized = null;
-            $DB->update_record('customlang', $current[$recordid]);
+            $DB->update_record('report_customlang', $current[$recordid]);
             continue;
         }
 
@@ -90,7 +96,7 @@ if ($translatorsubmitted) {
             $current[$recordid]->modified = 1;
             $current[$recordid]->outdated = 0;
             $current[$recordid]->timecustomized = $now;
-            $DB->update_record('customlang', $current[$recordid]);
+            $DB->update_record('report_customlang', $current[$recordid]);
             continue;
         }
     }
@@ -100,13 +106,13 @@ if ($translatorsubmitted) {
     }
     if (!empty($updates)) {
         list($sql, $params) = $DB->get_in_or_equal($updates);
-        $DB->set_field_select('customlang', 'outdated', 0, "local IS NOT NULL AND id $sql", $params);
+        $DB->set_field_select('report_customlang', 'outdated', 0, "local IS NOT NULL AND id $sql", $params);
     }
 
     redirect($nexturl);
 }
 
-$translator = new report_customlang_translator($PAGE->url, current_language(), $filterdata, $currentpage);
+$translator = new report_customlang_translator($PAGE->url, $lng, $filterdata, $currentpage);
 
 // output starts here
 $output     = $PAGE->get_renderer('report_customlang');

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');
@@ -33,39 +35,63 @@ require_capability('report/customlang:view', get_system_context());
 
 $action  = optional_param('action', '', PARAM_ALPHA);
 $confirm = optional_param('confirm', false, PARAM_BOOL);
+$lng     = optional_param('lng', '', PARAM_LANG);
 
 admin_externalpage_setup('reportcustomlang');
+$langs = get_string_manager()->get_list_of_translations();
 
 // pre-output actions
 if ($action === 'checkout') {
     require_sesskey();
     require_capability('report/customlang:edit', get_system_context());
-    report_customlang_utils::checkout(current_language());
-    redirect(new moodle_url('/admin/report/customlang/edit.php'));
+    if (empty($lng)) {
+        print_error('missingparameter');
+    }
+
+    $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') {
     require_sesskey();
     require_capability('report/customlang:edit', get_system_context());
+    if (empty($lng)) {
+        print_error('missingparameter');
+    }
 
     if (!$confirm) {
         $output = $PAGE->get_renderer('report_customlang');
         echo $output->header();
         echo $output->heading(get_string('pluginname', 'report_customlang'));
-        $numofmodified = report_customlang_utils::get_count_of_modified(current_language());
+        echo $output->heading($langs[$lng], 3);
+        $numofmodified = report_customlang_utils::get_count_of_modified($lng);
         if ($numofmodified != 0) {
             echo $output->heading(get_string('modifiednum', 'report_customlang', $numofmodified), 3);
             echo $output->confirm(get_string('confirmcheckin', 'report_customlang'),
-                                  new moodle_url($PAGE->url, array('action'=>'checkin', 'confirm'=>1)), $PAGE->url);
+                                  new moodle_url($PAGE->url, array('action'=>'checkin', 'lng'=>$lng, 'confirm'=>1)),
+                                  new moodle_url($PAGE->url, array('lng'=>$lng)));
         } else {
             echo $output->heading(get_string('modifiedno', 'report_customlang', $numofmodified), 3);
-            echo $output->continue_button($PAGE->url);
+            echo $output->continue_button(new moodle_url($PAGE->url, array('lng' => $lng)));
         }
         echo $output->footer();
         die();
 
     } else {
-        report_customlang_utils::checkin(current_language());
+        report_customlang_utils::checkin($lng);
         redirect($PAGE->url);
     }
 }
@@ -76,9 +102,18 @@ $output = $PAGE->get_renderer('report_customlang');
 echo $output->header();
 echo $output->heading(get_string('pluginname', 'report_customlang'));
 
-echo $output->box($output->lang_menu(), 'langmenubox');
+if (empty($lng)) {
+    $s = new single_select($PAGE->url, 'lng', $langs);
+    $s->label = get_accesshide(get_string('language'));
+    $s->class = 'langselector';
+    echo $output->box($OUTPUT->render($s), 'langselectorbox');
+    echo $OUTPUT->footer();
+    exit;
+}
 
-$numofmodified = report_customlang_utils::get_count_of_modified(current_language());
+echo $output->heading($langs[$lng], 3);
+
+$numofmodified = report_customlang_utils::get_count_of_modified($lng);
 
 if ($numofmodified != 0) {
     echo $output->heading(get_string('modifiednum', 'report_customlang', $numofmodified), 3);
@@ -88,13 +123,13 @@ $menu = array();
 if (has_capability('report/customlang:edit', get_system_context())) {
     $menu['checkout'] = array(
         'title'     => get_string('checkout', 'report_customlang'),
-        'url'       => new moodle_url($PAGE->url, array('action' => 'checkout')),
+        'url'       => new moodle_url($PAGE->url, array('action' => 'checkout', 'lng' => $lng)),
         'method'    => 'post',
     );
     if ($numofmodified != 0) {
         $menu['checkin'] = array(
             'title'     => get_string('checkin', 'report_customlang'),
-            'url'       => new moodle_url($PAGE->url, array('action' => 'checkin')),
+            'url'       => new moodle_url($PAGE->url, array('action' => 'checkin', 'lng' => $lng)),
             'method'    => 'post',
         );
     }

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

@@ -27,7 +27,9 @@
 defined('MOODLE_INTERNAL') || die();
 
 $string['checkin'] = 'Check in strings into disk';
-$string['checkout'] = 'Check out strings into translator';
+$string['checkout'] = 'Check out strings into the translator';
+$string['checkoutdone'] = 'Strings checked out successfully into the translator';
+$string['checkoutinprogress'] = 'Checking out strings into the translator';
 $string['confirmcheckin'] = 'You are about to check in modified strings into your local language pack. This will export the customized strings from the translator into the data directory and Moodle will start using the modified strings. Press \'Continue\' button to proceed check in.';
 $string['customlang:edit'] = 'Edit local translation';
 $string['customlang:view'] = 'View local translation';

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,12 +89,13 @@ 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
-        $current = $DB->get_records('customlang_components', null, 'name', 'name,version,id');
+        $current = $DB->get_records('report_customlang_components', null, 'name', 'name,version,id');
         foreach (self::list_components() as $component) {
             if (empty($current[$component])) {
                 $record = new stdclass();
@@ -98,21 +105,25 @@ class report_customlang_utils {
                 } else {
                     $record->version = $version;
                 }
-                $DB->insert_record('customlang_components', $record);
+                $DB->insert_record('report_customlang_components', $record);
             } elseif ($version = get_component_version($component)) {
                 if (is_null($current[$component]->version) or ($version > $current[$component]->version)) {
-                    $DB->set_field('customlang_components', 'version', $version, array('id' => $current[$component]->id));
+                    $DB->set_field('report_customlang_components', 'version', $version, array('id' => $current[$component]->id));
                 }
             }
         }
         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('customlang_components');
+        $components = $DB->get_records('report_customlang_components');
         foreach ($components as $component) {
-            $sql = "SELECT stringid, s.*
-                      FROM {customlang} s
+            $sql = "SELECT stringid, id, lang, componentid, original, master, local, timemodified, timecustomized, outdated, modified
+                      FROM {report_customlang} s
                      WHERE lang = ? AND componentid = ?
                   ORDER BY stringid";
             $current = $DB->get_records_sql($sql, array($lang, $component->id));
@@ -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;
@@ -150,7 +167,7 @@ class report_customlang_utils {
                     }
 
                     if ($needsupdate) {
-                        $DB->update_record('customlang', $current[$stringid]);
+                        $DB->update_record('report_customlang', $current[$stringid]);
                         continue;
                     }
 
@@ -171,10 +188,14 @@ class report_customlang_utils {
                         $record->timecustomized = null;
                     }
 
-                    $DB->insert_record('customlang', $record);
+                    $DB->insert_record('report_customlang', $record);
                 }
             }
         }
+
+        if (!is_null($progressbar)) {
+            $progressbar->update_full(100, get_string('checkoutdone', 'report_customlang'));
+        }
     }
 
     /**
@@ -192,8 +213,8 @@ class report_customlang_utils {
 
         // get all customized strings from updated components
         $sql = "SELECT s.*, c.name AS component
-                  FROM {customlang} s
-                  JOIN {customlang_components} c ON s.componentid = c.id
+                  FROM {report_customlang} s
+                  JOIN {report_customlang_components} c ON s.componentid = c.id
                  WHERE s.lang = ?
                        AND (s.local IS NOT NULL OR s.modified = 1)
               ORDER BY componentid, stringid";
@@ -211,7 +232,7 @@ class report_customlang_utils {
             self::dump_strings($lang, $component, $strings);
         }
 
-        $DB->set_field_select('customlang', 'modified', 0, 'lang = ?', array($lang));
+        $DB->set_field_select('report_customlang', 'modified', 0, 'lang = ?', array($lang));
         $sm = get_string_manager();
         $sm->reset_caches();
     }
@@ -257,9 +278,6 @@ class report_customlang_utils {
             $packageinfo .= "\n * @subpackage $subpackage";
         }
         $filepath = self::get_localpack_location($lang);
-        if ($filepath !== clean_param($filepath, PARAM_SAFEPATH)) {
-            throw new coding_exception('Incorrect file location '.s($filepath));
-        }
         $filepath = $filepath.'/'.$filename;
         if (!is_dir(dirname($filepath))) {
             check_dir_exists(dirname($filepath));
@@ -341,7 +359,7 @@ EOF
     public static function get_count_of_modified($lang) {
         global $DB;
 
-        return $DB->count_records('customlang', array('lang'=>$lang, 'modified'=>1));
+        return $DB->count_records('report_customlang', array('lang'=>$lang, 'modified'=>1));
     }
 
     /**
@@ -472,8 +490,8 @@ class report_customlang_translator implements renderable {
 
         $csql = "SELECT COUNT(*)";
         $fsql = "SELECT s.id, s.*, c.name AS component";
-        $sql  = "  FROM {customlang_components} c
-                   JOIN {customlang} s ON s.componentid = c.id
+        $sql  = "  FROM {report_customlang_components} c
+                   JOIN {report_customlang} s ON s.componentid = c.id
                   WHERE s.lang = :lang
                         AND c.name $insql";
 

admin/report/customlang/module.js

@@ -0,0 +1,45 @@
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * @package    report
+ * @subpackage customlang
+ * @copyright  2010 David Mudrak <david@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+/**
+ * @namespace
+ */
+M.report_customlang = M.report_customlang || {};
+
+/**
+ * YUI instance holder
+ */
+M.report_customlang.Y = {};
+
+/**
+ * Initialize JS support for the edit.php
+ *
+ * @param {Object} Y YUI instance
+ */
+M.report_customlang.init_editor = function(Y) {
+    M.report_customlang.Y = Y;
+
+    Y.all('#translator .local textarea').each(function (textarea) {
+        var cell = textarea.get('parentNode');
+        textarea.setStyle('height', cell.getComputedStyle('height'));
+    });
+}

admin/report/customlang/renderer.php

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

admin/report/customlang/styles.css

@@ -1,4 +1,4 @@
-.path-admin-report-customlang .langmenubox,
+.path-admin-report-customlang .langselectorbox,
 .path-admin-report-customlang fieldset.buttonsbar,
 .path-admin-report-customlang .menu {
     margin: 5px auto;
@@ -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  = 2010082500;
-$plugin->requires = 2010080901;
+$plugin->version  = 2011041900;
+$plugin->requires = 2010120700;

admin/report/profiling/index.php

@@ -0,0 +1,186 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * @package    core
+ * @subpackage profiling
+ * @copyright  2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+// TODO: Move all the DB stuff to profiling_db_xxxx() function in xhprof_moodle.php
+
+require_once(dirname(__FILE__).'/../../../config.php');
+require_once($CFG->libdir.'/adminlib.php');
+require_once($CFG->libdir . '/xhprof/xhprof_moodle.php');
+
+define('PROFILING_RUNSPERPAGE', 50);
+
+// page parameters
+$script   = optional_param('script', null, PARAM_PATH);
+$runid    = optional_param('runid', null, PARAM_ALPHANUM);
+$runid2   = optional_param('runid2', null, PARAM_ALPHANUM);
+$listurl  = optional_param('listurl', null, PARAM_PATH);
+$runreference= optional_param('runreference', 0, PARAM_INT);
+$runcomment  = optional_param('runcomment', null, PARAM_TEXT);
+
+$dbfields = 'runid, url, totalexecutiontime, totalcputime, ' .
+            'totalcalls, totalmemory, runreference, runcomment, timecreated';
+
+admin_externalpage_setup('reportprofiling');
+
+// Always add listurl if available
+if ($listurl) {
+    $listurlnav = new moodle_url('/admin/report/profiling/index.php', array('listurl' => $listurl));
+    $PAGE->navbar->add($listurl, $listurlnav);
+}
+
+// Header
+echo $OUTPUT->header();
+
+// We have requested the last available run for one script
+if (isset($script)) {
+    // Get the last available run for the given script
+    $run = $DB->get_record_sql("SELECT $dbfields
+                                 FROM {profiling}
+                                WHERE url = ?
+                                  AND id = (SELECT MAX(id)
+                                              FROM {profiling}
+                                             WHERE url = ?)",
+                              array($script, $script), IGNORE_MISSING);
+
+    // No run found for script, warn and exit
+    if (!$run) {
+        notice(get_string('cannotfindanyrunforurl', 'report_profiling', $script), 'index.php');
+    }
+
+    // Check if there is any previous run marked as reference one
+    $prevreferences = $DB->get_records_select('profiling',
+                                              'url = ? AND runreference = 1 AND timecreated < ?',
+                                              array($run->url, $run->timecreated),
+                                              'timecreated DESC', 'runid', 0, 1);
+    $prevrunid = $prevreferences ? reset($prevreferences)->runid : false;
+    echo $OUTPUT->box_start('generalbox boxwidthwide boxaligncenter');
+    $header = get_string('lastrunof', 'report_profiling', $script);
+    echo $OUTPUT->heading($header);
+    $table = profiling_print_run($run, $prevrunid);
+    echo $table;
+    echo $OUTPUT->box_end();
+
+
+// We have requested the diff between 2 runs
+} else if (isset($runid) && isset($runid2)) {
+    $run1 = $DB->get_record('profiling', array('runid'=>$runid), $dbfields, MUST_EXIST);
+    $run2 = $DB->get_record('profiling', array('runid'=>$runid2), $dbfields, MUST_EXIST);
+    if ($run1->url == $run2->url && $run1->runid != $run2->runid) {
+        if ($run2->timecreated < $run1->timecreated) {
+            $runtemp = $run1;
+            $run1 = $run2;
+            $run2 = $runtemp;
+        }
+        echo $OUTPUT->box_start('generalbox boxwidthwide boxaligncenter');
+        $header = get_string('differencesbetween2runsof', 'report_profiling', $run1->url);
+        echo $OUTPUT->heading($header);
+        $table = profiling_print_rundiff($run1, $run2);
+        echo $table;
+        echo $OUTPUT->box_end();
+    }
+
+
+// We have requested one run, invoke it
+} else if (isset($runid)) {
+    // Check if we are trying to update the runreference/runcomment for the run
+    if (isset($runcomment) && confirm_sesskey()) {
+        $id = $DB->get_field('profiling', 'id', array('runid' => $runid), MUST_EXIST);
+        $rec = new stdClass();
+        $rec->id = $id;
+        $rec->runreference = (bool)$runreference;
+        $rec->runcomment   = $runcomment;
+        $DB->update_record('profiling', $rec);
+    }
+    // Get the requested runid
+    $run = $DB->get_record('profiling', array('runid'=>$runid), $dbfields, IGNORE_MISSING);
+
+    // No run found for runid, warn and exit
+    if (!$run) {
+        notice(get_string('cannotfindanyrunforrunid', 'report_profiling', $runid), 'index.php');
+    }
+
+    // Check if there is any previous run marked as reference one
+    $prevreferences = $DB->get_records_select('profiling',
+                                              'url = ? AND runreference = 1 AND timecreated < ?',
+                                              array($run->url, $run->timecreated),
+                                              'timecreated DESC', 'runid', 0, 1);
+    $prevrunid = $prevreferences ? reset($prevreferences)->runid : false;
+    echo $OUTPUT->box_start('generalbox boxwidthwide boxaligncenter');
+    $header = get_string('summaryof', 'report_profiling', $run->url);
+    echo $OUTPUT->heading($header);
+    $table = profiling_print_run($run, $prevrunid);
+    echo $table;
+    echo $OUTPUT->box_end();
+
+
+// Default: List one page of runs
+} else {
+
+    // The flexitable that will root listings
+    $table = new xhprof_table_sql('profiling-list-table');
+    $baseurl = $CFG->wwwroot . '/admin/report/profiling/index.php';
+
+    // Check if we are listing all or some URL ones
+    $sqlconditions = '';
+    $sqlparams = array();
+    if (!isset($listurl)) {
+        $header = get_string('pluginname', 'report_profiling');
+        $sqlconditions = '1 = 1';
+        $table->set_listurlmode(false);
+    } else {
+        $header =  get_string('profilingrunsfor', 'report_profiling', $listurl);
+        $sqlconditions = 'url = :url';
+        $sqlparams['url'] = $listurl;
+        $table->set_listurlmode(true);
+        $baseurl .= '?listurl=' . urlencode($listurl);
+    }
+
+    echo $OUTPUT->heading($header);
+
+    // TODO: Fix flexitable to validate tsort/thide/tshow/tifirs/tilast/page
+    // TODO: Fix table_sql to allow it to work without WHERE clause
+    // add silly condition (1 = 1) because of table_sql bug
+    $table->set_sql($dbfields, '{profiling}', $sqlconditions, $sqlparams);
+    $table->set_count_sql("SELECT COUNT(*) FROM {profiling} WHERE $sqlconditions", $sqlparams);
+    $columns = array(
+        'url', 'timecreated', 'totalexecutiontime', 'totalcputime',
+        'totalcalls', 'totalmemory', 'runcomment');
+    $headers = array(
+        get_string('url'), get_string('date'), get_string('executiontime', 'report_profiling'),
+        get_string('cputime', 'report_profiling'), get_string('calls', 'report_profiling'),
+        get_string('memory', 'report_profiling'), get_string('comment', 'report_profiling'));
+    $table->define_columns($columns);
+    $table->define_headers($headers);
+    $table->sortable(true, 'timecreated', SORT_DESC);
+    $table->define_baseurl($baseurl);
+    $table->column_suppress('url');
+    $table->out(PROFILING_RUNSPERPAGE, true);
+
+    // Print the controller block with different options
+    echo profiling_list_controls($listurl);
+}
+
+// Footer.
+echo $OUTPUT->footer();
+

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

@@ -0,0 +1,45 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Strings for component 'report_profiling', language 'en', branch 'MOODLE_20_STABLE'
+ *
+ * @package   report_profiling
+ * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+$string['calls'] = 'Function calls';
+$string['cannotfindanyrunforurl'] = 'Sorry, cannot find any profiling run for the \'{$a}\' URL';
+$string['cannotfindanyrunforrunid'] = 'Sorry, cannot find the \'{$a}\' profiling run';
+$string['comment'] = 'Comment';
+$string['differencesbetween2runsof'] = 'Differences between 2 runs of {$a}';
+$string['executiontime'] = 'Execution time';
+$string['cputime'] = 'CPU time';
+$string['lastrunof'] = 'Summary of last run of {$a}';
+$string['markreferencerun'] = 'Mark as reference run/comment';
+$string['memory'] = 'Memory used';
+$string['pluginname'] = 'Profiling runs';
+$string['profilingfocusscript'] = 'Focus on profiling runs for the script: {$a}';
+$string['profilingruns'] = 'Profiling runs';
+$string['profilingrunsfor'] = 'Profiling runs for {$a}';
+$string['referencerun'] = 'Reference run/comment';
+$string['runid'] = 'Run ID';
+$string['summaryof'] = 'Summary of {$a}';
+$string['viewdetails'] = 'View profiling details';
+$string['viewdiff'] = 'View profiling differences with last reference run';
+$string['viewdiffdetails'] = 'View profiling diff details';

admin/report/profiling/settings.php

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

admin/report/profiling/styles.css

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

admin/report/questioninstances/index.php

@@ -15,7 +15,7 @@ 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.

admin/report/security/index.php

@@ -23,6 +23,8 @@
 //                                                                       //
 ///////////////////////////////////////////////////////////////////////////
 
+define('NO_OUTPUT_BUFFERING', true);
+
 require_once('../../../config.php');
 require_once($CFG->dirroot.'/'.$CFG->admin.'/report/security/lib.php');
 require_once($CFG->libdir.'/adminlib.php');
@@ -39,18 +41,16 @@ if (array_search($issue, $issues, true) === false) {
 }
 
 // we may need a bit more memory and this may take a long time to process
-@raise_memory_limit('128M');
+raise_memory_limit(MEMORY_EXTRA);
 @set_time_limit(0);
 
 // Print the header.
-admin_externalpage_setup('reportsecurity');
+admin_externalpage_setup('reportsecurity', '', null, '', array('pagelayout'=>'report'));
 echo $OUTPUT->header();
 
 echo $OUTPUT->heading(get_string('pluginname', 'report_security'));
 
 echo '<div id="timewarning">'.get_string('timewarning', 'report_security').'</div>';
-while(@ob_end_flush());
-@flush();
 
 $strok       = '<span class="statusok">'.get_string('statusok', 'report_security').'</span>';
 $strinfo     = '<span class="statusinfo">'.get_string('statusinfo', 'report_security').'</span>';

admin/report/security/lib.php

@@ -784,7 +784,7 @@ function report_security_check_riskbackup($detailed=false) {
     $syscontext = get_context_instance(CONTEXT_SYSTEM);
 
     $params = array('capability'=>'moodle/backup:userinfo', 'permission'=>CAP_ALLOW, 'contextid'=>$syscontext->id);
-    $sql = "SELECT DISTINCT r.*
+    $sql = "SELECT DISTINCT r.id, r.name, r.shortname, r.sortorder, r.archetype
               FROM {role} r
               JOIN {role_capabilities} rc ON rc.roleid = r.id
              WHERE rc.capability = :capability
@@ -793,7 +793,7 @@ function report_security_check_riskbackup($detailed=false) {
     $systemroles = $DB->get_records_sql($sql, $params);
 
     $params = array('capability'=>'moodle/backup:userinfo', 'permission'=>CAP_ALLOW, 'contextid'=>$syscontext->id);
-    $sql = "SELECT DISTINCT r.*, rc.contextid
+    $sql = "SELECT DISTINCT r.id, r.name, r.shortname, r.sortorder, r.archetype, rc.contextid
               FROM {role} r
               JOIN {role_capabilities} rc ON rc.roleid = r.id
              WHERE rc.capability = :capability

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,19 +151,21 @@ function search_spammers($keywords) {
     $params = array('userid'=>$USER->id);
 
     $keywordfull = array();
+    $i = 0;
     foreach ($keywords as $keyword) {
-        $keywordfull[] = $DB->sql_like('description', ':descpat', false);
-        $params['descpat'] = "%$keyword%";
-        $keywordfull2[] = $DB->sql_like('p.summary', ':sumpat', false);
-        $params['sumpat'] = "%$keyword%";
+        $keywordfull[] = $DB->sql_like('description', ':descpat'.$i, false);
+        $params['descpat'.$i] = "%$keyword%";
+        $keywordfull2[] = $DB->sql_like('p.summary', ':sumpat'.$i, false);
+        $params['sumpat'.$i] = "%$keyword%";
+        $i++;
     }
     $conditions = '( '.implode(' OR ', $keywordfull).' )';
     $conditions2 = '( '.implode(' OR ', $keywordfull2).' )';
 
     $sql  = "SELECT * FROM {user} WHERE deleted = 0 AND id <> :userid AND $conditions";  // Exclude oneself
     $sql2 = "SELECT u.*, p.summary FROM {user} AS u, {post} AS p WHERE $conditions2 AND u.deleted = 0 AND u.id=p.userid AND u.id <> :userid";
-    $spamusers_desc = $DB->get_recordset_sql($sql);
-    $spamusers_blog = $DB->get_recordset_sql($sql2);
+    $spamusers_desc = $DB->get_recordset_sql($sql, $params);
+    $spamusers_blog = $DB->get_recordset_sql($sql2, $params);
 
     $keywordlist = implode(', ', $keywords);
     echo $OUTPUT->box(get_string('spamresult', 'report_spamcleaner').s($keywordlist)).' ...';
@@ -267,7 +269,7 @@ function print_user_entry($user, $keywords, $count) {
             $user->descriptionformat = FORMAT_MOODLE;
         }
 
-        $html .= '<td align="left">'.format_text($user->description, $user->descriptionformat).'</td>';
+        $html .= '<td align="left">'.format_text($user->description, $user->descriptionformat, array('overflowdiv'=>true)).'</td>';
         $html .= '<td width="100px" align="center">';
         $html .= '<button onclick="M.report_spamcleaner.del_user(this,'.$user->id.')">'.get_string('deleteuser', 'admin').'</button><br />';
         $html .= '<button onclick="M.report_spamcleaner.ignore_user(this,'.$user->id.')">'.get_string('ignore', 'admin').'</button>';

admin/report/spamcleaner/module.js

@@ -108,7 +108,7 @@ M.report_spamcleaner = {
             context.Y = Y;
             context.me = me;
             if (Y.one("#removeall_btn")) {
-            	Y.on("click", context.del_all, "#removeall_btn");
+                Y.on("click", context.del_all, "#removeall_btn");
             }
         });
     }

admin/report/unittest/dbtest.php

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

admin/report/unittest/index.php

@@ -8,7 +8,8 @@
  * @package SimpleTestEx
  */
 
-/** */
+define('NO_OUTPUT_BUFFERING', true);
+
 require_once(dirname(__FILE__).'/../../../config.php');
 require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->libdir.'/simpletestcoveragelib.php');
@@ -18,7 +19,7 @@ require_once('ex_reporter.php');
 // Always run the unit tests in developer debug mode.
 $CFG->debug = DEBUG_DEVELOPER;
 error_reporting($CFG->debug);
-raise_memory_limit('256M');
+raise_memory_limit(MEMORY_EXTRA);
 
 // page parameters
 $path         = optional_param('path', null, PARAM_PATH);
@@ -33,10 +34,19 @@ $unittest = true;
 global $UNITTEST;
 $UNITTEST = new stdClass();
 
+// This limit is the time allowed per individual test function. Please do not
+// increase this value. If you get a PHP time limit when running unit tests,
+// find the unit test which is running slowly, and either make it faster,
+// split it into multiple tests, or call set_time_limit within that test.
+define('TIME_ALLOWED_PER_UNIT_TEST', 60);
+
 // Print the header.
 $strtitle = get_string('unittests', 'simpletest');
 
 if (!is_null($path)) {
+    //trim so user doesn't get an error if they include a space on the end of the path (ie by pasting path)
+    $path = trim($path);
+
     // Turn off xmlstrictheaders during the unit test run.
     $origxmlstrictheaders = !empty($CFG->xmlstrictheaders);
     $CFG->xmlstrictheaders = false;
@@ -87,7 +97,6 @@ if (!is_null($path)) {
             $title = get_string('moodleunittests', 'simpletest', $displaypath);
         }
         echo $OUTPUT->heading($title);
-        set_time_limit(300); // 5 mins
         $test->run($reporter);
     }
 

admin/report/unsuproles/index.php

@@ -92,7 +92,7 @@ foreach ($rs as $problem) {
 $rs->close();
 
 if (!$problems) {
-    notify(get_string('noprolbems', 'report_unsuproles'), 'notifysuccess');
+    echo $OUTPUT->notification(get_string('noprolbems', 'report_unsuproles'), 'notifysuccess');
 } else {
     $roles = get_all_roles();
     $data = array();

admin/repository.php

@@ -10,7 +10,7 @@ $sure          = optional_param('sure', '', PARAM_ALPHA);
 
 $display = true; // fall through to normal display
 
-$pagename = 'repositorycontroller';
+$pagename = 'managerepositories';
 
 if ($action == 'edit') {
     $pagename = 'repositorysettings' . $repository;
@@ -36,12 +36,21 @@ require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
 admin_externalpage_setup($pagename);
 
 $sesskeyurl = $CFG->wwwroot.'/'.$CFG->admin.'/repository.php?sesskey=' . sesskey();
-$baseurl    = $CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section=managerepositories';
+$baseurl    = $CFG->wwwroot.'/'.$CFG->admin.'/repository.php';
 
 $configstr  = get_string('manage', 'repository');
 
 $return = true;
 
+/**
+ * Helper function that generates a moodle_url object
+ * relevant to the repository
+ */
+function repository_action_url($repository) {
+    global $baseurl;
+    return new moodle_url($baseurl, array('sesskey'=>sesskey(), 'repos'=>$repository));
+}
+
 if (($action == 'edit') || ($action == 'new')) {
     $pluginname = '';
     if ($action == 'edit') {
@@ -193,9 +202,158 @@ if (($action == 'edit') || ($action == 'new')) {
 } else if ($action == 'movedown') {
     $repositorytype = repository::get_type_by_typename($repository);
     $repositorytype->move_order('down');
+} else {
+    // If page is loaded directly
+    echo $OUTPUT->header();
+    echo $OUTPUT->heading(get_string('manage', 'repository'));
+
+    // Get strings that are used
+    $strshow = get_string('on', 'repository');
+    $strhide = get_string('off', 'repository');
+    $strdelete = get_string('disabled', 'repository');
+
+    $actionchoicesforexisting = array(
+        'show' => $strshow,
+        'hide' => $strhide,
+        'delete' => $strdelete
+    );
+
+    $actionchoicesfornew = array(
+        'newon' => $strshow,
+        'newoff' => $strhide,
+        'delete' => $strdelete
+    );
+
+    $output = '';
+    $output .= $OUTPUT->box_start('generalbox');
+
+    // Set strings that are used multiple times
+    $settingsstr = get_string('settings');
+    $disablestr = get_string('disable');
+
+    // Table to list plug-ins
+    $table = new html_table();
+    $table->head = array(get_string('name'), get_string('isactive', 'repository'), get_string('order'), $settingsstr);
+    $table->align = array('left', 'center', 'center', 'center', 'center');
+    $table->data = array();
+
+    // Get list of used plug-ins
+    $instances = repository::get_types();
+    if (!empty($instances)) {
+        // Array to store plugins being used
+        $alreadyplugins = array();
+        $totalinstances = count($instances);
+        $updowncount = 1;
+        foreach ($instances as $i) {
+            $settings = '';
+            $typename = $i->get_typename();
+            // Display edit link only if you can config the type or if it has multiple instances (e.g. has instance config)
+            $typeoptionnames = repository::static_function($typename, 'get_type_option_names');
+            $instanceoptionnames = repository::static_function($typename, 'get_instance_option_names');
+
+            if (!empty($typeoptionnames) || !empty($instanceoptionnames)) {
+                // Calculate number of instances in order to display them for the Moodle administrator
+                if (!empty($instanceoptionnames)) {
+                    $params = array();
+                    $params['context'] = array(get_system_context());
+                    $params['onlyvisible'] = false;
+                    $params['type'] = $typename;
+                    $admininstancenumber = count(repository::static_function($typename, 'get_instances', $params));
+                    // site instances
+                    $admininstancenumbertext = get_string('instancesforsite', 'repository', $admininstancenumber);
+                    $params['context'] = array();
+                    $instances = repository::static_function($typename, 'get_instances', $params);
+                    $courseinstances = array();
+                    $userinstances = array();
+
+                    foreach ($instances as $instance) {
+                        if ($instance->context->contextlevel == CONTEXT_COURSE) {
+                            $courseinstances[] = $instance;
+                        } else if ($instance->context->contextlevel == CONTEXT_USER) {
+                            $userinstances[] = $instance;
+                        }
+                    }
+                    // course instances
+                    $instancenumber = count($courseinstances);
+                    $courseinstancenumbertext = get_string('instancesforcourses', 'repository', $instancenumber);
+
+                    // user private instances
+                    $instancenumber =  count($userinstances);
+                    $userinstancenumbertext = get_string('instancesforusers', 'repository', $instancenumber);
+                } else {
+                    $admininstancenumbertext = "";
+                    $courseinstancenumbertext = "";
+                    $userinstancenumbertext = "";
+                }
+
+                $settings .= '<a href="' . $sesskeyurl . '&amp;action=edit&amp;repos=' . $typename . '">' . $settingsstr .'</a>';
+
+                $settings .= $OUTPUT->container_start('mdl-left');
+                $settings .= '<br/>';
+                $settings .= $admininstancenumbertext;
+                $settings .= '<br/>';
+                $settings .= $courseinstancenumbertext;
+                $settings .= '<br/>';
+                $settings .= $userinstancenumbertext;
+                $settings .= $OUTPUT->container_end();
+            }
+            // Get the current visibility
+            if ($i->get_visible()) {
+                $currentaction = 'show';
+            } else {
+                $currentaction = 'hide';
+            }
+
+            $select = new single_select(repository_action_url($typename, 'repos'), 'action', $actionchoicesforexisting, $currentaction, null, 'applyto' . basename($typename));
+
+            // Display up/down link
+            $updown = '';
+            $spacer = $OUTPUT->spacer(array('height'=>15, 'width'=>15)); // should be done with CSS instead
+
+            if ($updowncount > 1) {
+                $updown .= "<a href=\"$sesskeyurl&amp;action=moveup&amp;repos=".$typename."\">";
+                $updown .= "<img src=\"" . $OUTPUT->pix_url('t/up') . "\" alt=\"up\" /></a>&nbsp;";
+            }
+            else {
+                $updown .= $spacer;
+            }
+            if ($updowncount < $totalinstances) {
+                $updown .= "<a href=\"$sesskeyurl&amp;action=movedown&amp;repos=".$typename."\">";
+                $updown .= "<img src=\"" . $OUTPUT->pix_url('t/down') . "\" alt=\"down\" /></a>";
+            }
+            else {
+                $updown .= $spacer;
+            }
+
+            $updowncount++;
+
+            $table->data[] = array($i->get_readablename(), $OUTPUT->render($select), $updown, $settings);
+
+            if (!in_array($typename, $alreadyplugins)) {
+                $alreadyplugins[] = $typename;
+            }
+        }
+    }
+
+    // Get all the plugins that exist on disk
+    $plugins = get_plugin_list('repository');
+    if (!empty($plugins)) {
+        foreach ($plugins as $plugin => $dir) {
+            // Check that it has not already been listed
+            if (!in_array($plugin, $alreadyplugins)) {
+                $select = new single_select(repository_action_url($plugin, 'repos'), 'action', $actionchoicesfornew, 'delete', null, 'applyto' . basename($plugin));
+                $table->data[] = array(get_string('pluginname', 'repository_'.$plugin), $OUTPUT->render($select), '', '');
+            }
+        }
+    }
+
+    $output .= html_writer::table($table);
+    $output .= $OUTPUT->box_end();
+    print $output;
+    $return = false;
 }
 
-if (!empty($return)) {
+if ($return) {
     redirect($baseurl);
 }
 echo $OUTPUT->footer();

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/resetemoticons.php

@@ -0,0 +1,45 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Resets the emoticons mapping into the default value
+ *
+ * @package   core
+ * @copyright 2010 David Mudrak <david@moodle.com>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+require(dirname(dirname(__FILE__)) . '/config.php');
+require_once($CFG->libdir.'/adminlib.php');
+
+admin_externalpage_setup('resetemoticons');
+
+$confirm = optional_param('confirm', false, PARAM_BOOL);
+
+if (!$confirm or !confirm_sesskey()) {
+    echo $OUTPUT->header();
+    echo $OUTPUT->heading(get_string('confirmation', 'admin'));
+    echo $OUTPUT->confirm(get_string('emoticonsreset', 'admin'),
+        new moodle_url($PAGE->url, array('confirm' => 1)),
+        new moodle_url('/admin/settings.php', array('section' => 'htmlsettings')));
+    echo $OUTPUT->footer();
+    die();
+}
+
+$manager = get_emoticon_manager();
+set_config('emoticons', $manager->encode_stored_config($manager->default_emoticons()));
+redirect(new moodle_url('/admin/settings.php', array('section' => 'htmlsettings')));

admin/roles/assign.php

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

admin/roles/lib.php

@@ -628,7 +628,7 @@ class define_role_table_advanced extends capability_table_with_risks {
 
         // Legacy type.
         $archetype = optional_param('archetype', null, PARAM_RAW);
-        if ($archetype) {
+        if (isset($archetype)) {
             $archetypes = get_role_archetypes();
             if (isset($archetypes[$archetype])){
                 $this->role->archetype = $archetype;
@@ -716,7 +716,6 @@ class define_role_table_advanced extends capability_table_with_risks {
     }
 
     protected function get_archetype_field($id) {
-        global $OUTPUT;
         $options = array();
         $options[''] = get_string('none');
         foreach(get_role_archetypes() as $type) {
@@ -777,12 +776,13 @@ class define_role_table_advanced extends capability_table_with_risks {
     }
 
     public function display() {
+        global $OUTPUT;
         // Extra fields at the top of the page.
         echo '<div class="topfields clearfix">';
-        $this->print_field('name', get_string('name'), $this->get_name_field('name'));
-        $this->print_field('shortname', get_string('shortname'), $this->get_shortname_field('shortname'));
+        $this->print_field('name', get_string('rolefullname', 'role'), $this->get_name_field('name'));
+        $this->print_field('shortname', get_string('roleshortname', 'role'), $this->get_shortname_field('shortname'));
         $this->print_field('edit-description', get_string('description'), $this->get_description_field('description'));
-        $this->print_field('menuarchetype', get_string('archetype', 'role'), $this->get_archetype_field('archetype'));
+        $this->print_field('menuarchetype', get_string('archetype', 'role').'&nbsp;'.$OUTPUT->help_icon('archetype', 'role'), $this->get_archetype_field('archetype'));
         $this->print_field('', get_string('maybeassignedin', 'role'), $this->get_assignable_levels_control());
         echo "</div>";
 
@@ -1142,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;
 
@@ -1316,6 +1316,7 @@ abstract class role_allow_role_page {
         foreach ($rs as $allow) {
             $this->allowed[$allow->roleid][$allow->{$this->targetcolname}] = true;
         }
+        $rs->close();
     }
 
     /**
@@ -1519,6 +1520,14 @@ class admins_potential_selector extends user_selector_base {
         $order = ' ORDER BY lastname ASC, firstname ASC';
         $params['localmnet'] = $CFG->mnet_localhost_id; // it could be dangerous to make remote users admins and also this could lead to other problems
 
+        // Check to see if there are too many to show sensibly.
+        if (!$this->is_validating()) {
+            $potentialcount = $DB->count_records_sql($countfields . $sql, $params);
+            if ($potentialcount > 100) {
+                return $this->too_many_results($search, $potentialcount);
+            }
+        }
+
         $availableusers = $DB->get_records_sql($fields . $sql . $order, $params);
 
         if (empty($availableusers)) {

admin/roles/manage.php

@@ -142,9 +142,6 @@
             break;
 
         case 'reset':
-            if (isset($undeletableroles[$roleid])) {
-                print_error('cannotresetthisrole', '', $baseurl);
-            }
             if (!$confirmed) {
                 // show confirmation
                 echo $OUTPUT->header();
@@ -167,10 +164,12 @@
                 die;
             }
 
-            // Do the reset.
+            // Reset context levels for standard archetypes
             if ($roles[$roleid]->archetype) {
                 set_role_contextlevels($roleid, get_default_contextlevels($roles[$roleid]->archetype));
             }
+
+            //reset or delete the capabilities
             reset_role_capabilities($roleid);
 
             // Mark context dirty, log and redirect.
@@ -195,7 +194,7 @@
     $table->head = array(
         get_string('role') . ' ' . $OUTPUT->help_icon('roles', 'role'),
         get_string('description'),
-        get_string('shortname'),
+        get_string('roleshortname', 'role'),
         get_string('edit')
     );
 

admin/roles/module.js

@@ -45,7 +45,11 @@ M.core_role.init_cap_table_filter = function(Y, tableid, contextid) {
             this.table = Y.one('#'+this.tableid);
 
             // Create a div to hold the search UI.
-            this.div = Y.Node.create('<div class="capabilitysearchui"></div>').setStyle('width', this.table.get('offsetWidth'));
+            this.div = Y.Node.create('<div class="capabilitysearchui"></div>').setStyles({
+                width : this.table.get('offsetWidth'),
+                marginLeft : 'auto',
+                marginRight : 'auto'
+            });
             // Create the capability search input.
             this.input = Y.Node.create('<input type="text" id="'+this.table.get('id')+'capabilitysearch" value="'+filtervalue+'" />');
             // Create a label for the search input.
@@ -89,7 +93,7 @@ M.core_role.init_cap_table_filter = function(Y, tableid, contextid) {
          */
         getFilterCookieValue : function() {
             var cookie = Y.Cookie.getSubs('captblflt');
-            if (cookie.fltcontext && cookie.fltcontext == this.context && parseInt(cookie.flttime) > new Date().getTime()-(60*60*1000)) {
+            if (cookie!=null && cookie.fltcontext && cookie.fltcontext == this.context && parseInt(cookie.flttime) > new Date().getTime()-(60*60*1000)) {
                 return cookie.fltvalue;
             }
             return '';
@@ -134,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/settings/appearance.php

@@ -54,8 +54,16 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
             6 => get_string('saturday', 'calendar')
         )));
     $temp->add(new admin_setting_special_calendar_weekend());
-    $temp->add(new admin_setting_configtext('calendar_lookahead',get_string('configlookahead','admin'),get_string('helpupcominglookahead', 'admin'),21,PARAM_INT));
-    $temp->add(new admin_setting_configtext('calendar_maxevents',get_string('configmaxevents','admin'),get_string('helpupcomingmaxevents', 'admin'),10,PARAM_INT));
+    $options = array();
+    for ($i=1; $i<=99; $i++) {
+        $options[$i] = $i;
+    }
+    $temp->add(new admin_setting_configselect('calendar_lookahead',get_string('configlookahead','admin'),get_string('helpupcominglookahead', 'admin'),21,$options));
+    $options = array();
+    for ($i=1; $i<=20; $i++) {
+        $options[$i] = $i;
+    }
+    $temp->add(new admin_setting_configselect('calendar_maxevents',get_string('configmaxevents','admin'),get_string('helpupcomingmaxevents', 'admin'),10,$options));
     $temp->add(new admin_setting_configcheckbox('enablecalendarexport', get_string('enablecalendarexport', 'admin'), get_string('configenablecalendarexport','admin'), 1));
     $temp->add(new admin_setting_configtext('calendar_exportsalt', get_string('calendarexportsalt','admin'), get_string('configcalendarexportsalt', 'admin'), random_string(60)));
     $ADMIN->add('appearance', $temp);
@@ -63,10 +71,10 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     // blog
     $temp = new admin_settingpage('blog', get_string('blog','blog'));
     $temp->add(new admin_setting_configcheckbox('useblogassociations', get_string('useblogassociations', 'blog'), get_string('configuseblogassociations','blog'), 1));
-    $temp->add(new admin_setting_bloglevel('bloglevel', get_string('bloglevel', 'admin'), get_string('configbloglevel', 'admin'), 4, array(5 => get_string('worldblogs','blog'),
-                                                                                                                                              4 => get_string('siteblogs','blog'),
-                                                                                                                                              1 => get_string('personalblogs','blog'),
-                                                                                                                                              0 => get_string('disableblogs','blog'))));
+    $temp->add(new admin_setting_bloglevel('bloglevel', get_string('bloglevel', 'admin'), get_string('configbloglevel', 'admin'), 4, array(BLOG_GLOBAL_LEVEL => get_string('worldblogs','blog'),
+                                                                                                                                           BLOG_SITE_LEVEL => get_string('siteblogs','blog'),
+                                                                                                                                           BLOG_USER_LEVEL => get_string('personalblogs','blog'),
+                                                                                                                                           0 => get_string('disableblogs','blog'))));
     $temp->add(new admin_setting_configcheckbox('useexternalblogs', get_string('useexternalblogs', 'blog'), get_string('configuseexternalblogs','blog'), 1));
     $temp->add(new admin_setting_configselect('externalblogcrontime', get_string('externalblogcrontime', 'blog'), get_string('configexternalblogcrontime', 'blog'), 86400,
         array(43200 => get_string('numhours', '', 12),
@@ -97,6 +105,8 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $temp->add(new admin_setting_configcheckbox('formatstringstriptags', get_string('stripalltitletags', 'admin'), get_string('configstripalltitletags', 'admin'), 1));
     $temp->add(new admin_setting_emoticons());
     $ADMIN->add('appearance', $temp);
+    $ADMIN->add('appearance', new admin_externalpage('resetemoticons', get_string('emoticonsreset', 'admin'),
+        new moodle_url('/admin/resetemoticons.php'), 'moodle/site:config', true));
 
     // "documentation" settingpage
     $temp = new admin_settingpage('documentation', get_string('moodledocs'));
@@ -122,12 +132,19 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $setting = new admin_setting_configcheckbox('cachejs', get_string('cachejs', 'admin'), get_string('cachejs_help', 'admin'), 1);
     $setting->set_updatedcallback('js_reset_all_caches');
     $temp->add($setting);
-    $temp->add(new admin_setting_configcheckbox('disablecourseajax', get_string('disablecourseajax', 'admin'), get_string('configdisablecourseajax', 'admin'),
-                                                isset($CFG->disablecourseajax) ? 1 : empty($CFG->enableajax)));
+    $temp->add(new admin_setting_configcheckbox('enablecourseajax', get_string('enablecourseajax', 'admin'),
+                                                get_string('enablecourseajax_desc', 'admin'), 1));
     $ADMIN->add('appearance', $temp);
 
     // link to tag management interface
     $ADMIN->add('appearance', new admin_externalpage('managetags', get_string('managetags', 'tag'), "$CFG->wwwroot/tag/manage.php"));
 
+    $temp = new admin_settingpage('additionalhtml', get_string('additionalhtml', 'admin'));
+    $temp->add(new admin_setting_heading('additionalhtml_heading', get_string('additionalhtml_heading', 'admin'), get_string('additionalhtml_desc', 'admin')));
+    $temp->add(new admin_setting_configtextarea('additionalhtmlhead', get_string('additionalhtmlhead', 'admin'), get_string('additionalhtmlhead_desc', 'admin'), '', PARAM_RAW));
+    $temp->add(new admin_setting_configtextarea('additionalhtmltopofbody', get_string('additionalhtmltopofbody', 'admin'), get_string('additionalhtmltopofbody_desc', 'admin'), '', PARAM_RAW));
+    $temp->add(new admin_setting_configtextarea('additionalhtmlfooter', get_string('additionalhtmlfooter', 'admin'), get_string('additionalhtmlfooter_desc', 'admin'), '', PARAM_RAW));
+    $ADMIN->add('appearance', $temp);
+
 } // end of speedup
 

admin/settings/courses.php

@@ -108,19 +108,22 @@ if ($hassiteconfig
     $ADMIN->add('backups', $temp);
 
 /// "backups" settingpage
-    $temp = new admin_settingpage('scheduled', get_string('scheduledsettings','backup'), 'moodle/backup:backupcourse');
-    $temp->add(new admin_setting_configcheckbox('backup/backup_sche_modules', get_string('includemodules'), get_string('backupincludemoduleshelp'), 0));
-    $temp->add(new admin_setting_configcheckbox('backup/backup_sche_withuserdata', get_string('includemoduleuserdata'), get_string('backupincludemoduleuserdatahelp'), 0));
-    $temp->add(new admin_setting_configselect('backup/backup_sche_users', get_string('users'), get_string('backupusershelp'),
-            0, array(0 => get_string('all'), 1 => get_string('course'))));
-    $temp->add(new admin_setting_configcheckbox('backup/backup_sche_logs', get_string('logs'), get_string('backuplogshelp'), 0));
-    $temp->add(new admin_setting_configcheckbox('backup/backup_sche_userfiles', get_string('userfiles'), get_string('backupuserfileshelp'), 0));
-    $temp->add(new admin_setting_configcheckbox('backup/backup_sche_coursefiles', get_string('coursefiles'), get_string('backupcoursefileshelp'), 0));
-    $temp->add(new admin_setting_configcheckbox('backup/backup_sche_sitefiles', get_string('sitefiles'), get_string('backupsitefileshelp'), 0));
-    $temp->add(new admin_setting_configcheckbox('backup_sche_gradebook_history', get_string('gradebookhistories', 'grades'), get_string('backupgradebookhistoryhelp'), 0));
-    $temp->add(new admin_setting_configcheckbox('backup/backup_sche_messages', get_string('messages', 'message'), get_string('backupmessageshelp','message'), 0));
-    $temp->add(new admin_setting_configcheckbox('backup/backup_sche_blogs', get_string('blogs', 'blog'), get_string('backupblogshelp','blog'), 0));
-
+    $temp = new admin_settingpage('automated', get_string('automatedsetup','backup'), 'moodle/backup:backupcourse');
+    $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'),
+        2 => get_string('autoactivemanual', 'backup')
+    )));
+    $temp->add(new admin_setting_special_backupdays());
+    $temp->add(new admin_setting_configtime('backup/backup_auto_hour', 'backup_auto_minute', get_string('executeat'),
+            get_string('backupexecuteathelp'), array('h' => 0, 'm' => 0)));
+    $storageoptions = array(
+        0 => get_string('storagecourseonly', 'backup'),
+        1 => get_string('storageexternalonly', 'backup'),
+        2 => get_string('storagecourseandexternal', 'backup')
+    );
+    $temp->add(new admin_setting_configselect('backup/backup_auto_storage', get_string('automatedstorage', 'backup'), get_string('automatedstoragehelp', 'backup'), 0, $storageoptions));
+    $temp->add(new admin_setting_configdirectory('backup/backup_auto_destination', get_string('saveto'), get_string('backupsavetohelp'), ''));
     $keepoptoins = array(
         0 => get_string('all'), 1 => '1',
         2 => '2',
@@ -135,13 +138,24 @@ if ($hassiteconfig
         300 => '300',
         400 => '400',
         500 => '500');
-    $temp->add(new admin_setting_configselect('backup/backup_sche_keep', get_string('keep'),
-            get_string('backupkeephelp'), 1, $keepoptoins));
-    $temp->add(new admin_setting_configcheckbox('backup/backup_sche_active', get_string('active'), get_string('backupactivehelp'), 0));
-    $temp->add(new admin_setting_special_backupdays());
-    $temp->add(new admin_setting_configtime('backup/backup_sche_hour', 'backup_sche_minute', get_string('executeat'),
-            get_string('backupexecuteathelp'), array('h' => 0, 'm' => 0)));
-    $temp->add(new admin_setting_configdirectory('backup/backup_sche_destination', get_string('saveto'), get_string('backupsavetohelp'), ''));
+    $temp->add(new admin_setting_configselect('backup/backup_auto_keep', get_string('keep'), get_string('backupkeephelp'), 1, $keepoptoins));
+
+
+    $temp->add(new admin_setting_heading('automatedsettings', get_string('automatedsettings','backup'), ''));
+    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_users', get_string('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('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->add('backups', $temp);
 

admin/settings/development.php

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

admin/settings/frontpage.php

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

admin/settings/language.php

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

admin/settings/location.php

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

admin/settings/mnet.php

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

admin/settings/plugins.php

@@ -216,11 +216,13 @@ if ($hassiteconfig) {
 
     $ADMIN->add('modules', new admin_category('portfoliosettings', $catname, empty($CFG->enableportfolios)));
 
-    // jump through hoops to do what we want
-    $temp = new admin_settingpage('manageportfolios', get_string('manageportfolios', 'portfolio'));
-    $temp->add(new admin_setting_heading('manageportfolios', get_string('activeportfolios', 'portfolio'), ''));
-    $temp->add(new admin_setting_manageportfolio());
-    $temp->add(new admin_setting_heading('manageportfolioscommon', get_string('commonsettings', 'admin'), get_string('commonsettingsdesc', 'portfolio')));
+    // Add manage page (with table)
+    $temp = new admin_page_manageportfolios();
+    $ADMIN->add('portfoliosettings', $temp);
+
+    // Add common settings page
+    $temp = new admin_settingpage('manageportfolioscommon', get_string('commonportfoliosettings', 'portfolio'));
+    $temp->add(new admin_setting_heading('manageportfolioscommon', '', get_string('commonsettingsdesc', 'portfolio')));
     $fileinfo = portfolio_filesize_info(); // make sure this is defined in one place since its used inside portfolio too to detect insane settings
     $fileoptions = $fileinfo['options'];
     $temp->add(new admin_setting_configselect(
@@ -273,10 +275,13 @@ if ($hassiteconfig) {
     $managerepo = get_string('manage', 'repository');
     $url = $CFG->wwwroot.'/'.$CFG->admin.'/repository.php';
     $ADMIN->add('modules', new admin_category('repositorysettings', $catname));
-    $temp = new admin_settingpage('managerepositories', $managerepo);
-    $temp->add(new admin_setting_heading('managerepositories', get_string('activerepository', 'repository'), ''));
-    $temp->add(new admin_setting_managerepository());
-    $temp->add(new admin_setting_heading('managerepositoriescommonheading', get_string('commonsettings', 'admin'), ''));
+
+    // Add main page (with table)
+    $temp = new admin_page_managerepositories();
+    $ADMIN->add('repositorysettings', $temp);
+
+    // Add common settings page
+    $temp = new admin_settingpage('managerepositoriescommon', get_string('commonrepositorysettings', 'repository'));
     $temp->add(new admin_setting_configtext('repositorycacheexpire', get_string('cacheexpire', 'repository'), get_string('configcacheexpire', 'repository'), 120));
     $temp->add(new admin_setting_configcheckbox('repositoryallowexternallinks', get_string('allowexternallinks', 'repository'), get_string('configallowexternallinks', 'repository'), 1));
     $temp->add(new admin_setting_configcheckbox('legacyfilesinnewcourses', get_string('legacyfilesinnewcourses', 'admin'), get_string('legacyfilesinnewcourses_help', 'admin'), 0));
@@ -316,6 +321,8 @@ 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'));
     $temp->add(new admin_setting_heading('manageserviceshelpexplaination', get_string('information', 'webservice'), get_string('servicehelpexplanation', 'webservice')));
@@ -331,9 +338,14 @@ if ($hassiteconfig) {
     if (empty($CFG->enablewebservices)) {
         $temp->add(new admin_setting_heading('webservicesaredisabled', '', get_string('disabledwarning', 'webservice')));
     }
-    $url = new moodle_url('/webservice/wsdoc.php');
-    $atag =html_writer::start_tag('a', array('href' => $url)).get_string('documentation', 'webservice').html_writer::end_tag('a');
-    $temp->add(new admin_setting_configcheckbox('enablewsdocumentation', get_string('enablewsdocumentation', 'admin'), get_string('configenablewsdocumentation', 'admin', $atag), false));
+
+    // We cannot use $OUTPUT this early, doing so means that we lose the ability
+    // to set the page layout on all admin pages.
+    // $wsdoclink = $OUTPUT->doc_link('How_to_get_a_security_key');
+    $url = new moodle_url(get_docs_url('How_to_get_a_security_key'));
+    $wsdoclink = html_writer::tag('a', get_string('supplyinfo'),array('href'=>$url));
+    $temp->add(new admin_setting_configcheckbox('enablewsdocumentation', get_string('enablewsdocumentation',
+                        'admin'), get_string('configenablewsdocumentation', 'admin', $wsdoclink), false));
     $ADMIN->add('webservicesettings', $temp);
     /// links to protocol pages
     $webservices_available = get_plugin_list('webservice');
@@ -357,18 +369,17 @@ if ($hassiteconfig) {
     }
     $ADMIN->add('webservicesettings', $temp);
 
-
+// Question type settings
 if ($hassiteconfig || has_capability('moodle/question:config', $systemcontext)) {
     // Question type settings.
     $ADMIN->add('modules', new admin_category('qtypesettings', get_string('questiontypes', 'admin')));
     $ADMIN->add('qtypesettings', new admin_page_manageqtypes());
-    require_once($CFG->libdir . '/questionlib.php');
-    global $QTYPES;
-    foreach ($QTYPES as $qtype) {
-        $settingsfile = $qtype->plugin_dir() . '/settings.php';
+    $qtypes = get_plugin_list('qtype');
+    foreach ($qtypes as $qtype => $path) {
+        $settingsfile = $path . '/settings.php';
         if (file_exists($settingsfile)) {
-            $settings = new admin_settingpage('qtypesetting' . $qtype->name(),
-                    $qtype->local_name(), 'moodle/question:config');
+            $settings = new admin_settingpage('qtypesetting' . $qtype,
+                    get_string('pluginname', 'qtype_' . $qtype), 'moodle/question:config');
             include($settingsfile);
             if ($settings) {
                 $ADMIN->add('qtypesettings', $settings);
@@ -376,6 +387,8 @@ if ($hassiteconfig || has_capability('moodle/question:config', $systemcontext))
         }
     }
 }
+
+// Plagiarism plugin settings
 if ($hassiteconfig && !empty($CFG->enableplagiarism)) {
     $ADMIN->add('modules', new admin_category('plagiarism', get_string('plagiarism', 'plagiarism')));
     $temp = new admin_settingpage('plagiarismsettings', get_string('plagiarismsettings', 'plagiarism'));
@@ -388,8 +401,31 @@ if ($hassiteconfig && !empty($CFG->enableplagiarism)) {
     }
 }
 $ADMIN->add('reports', new admin_externalpage('comments', get_string('comments'), $CFG->wwwroot.'/comment/', 'moodle/site:viewreports'));
-/// Now add reports
 
+// Course reports settings
+if ($hassiteconfig) {
+    $pages = array();
+    foreach (get_plugin_list('coursereport') as $report => $path) {
+        $file = $CFG->dirroot . '/course/report/' . $report . '/settings.php';
+        if (file_exists($file)) {
+            $settings = new admin_settingpage('coursereport' . $report,
+                    get_string('pluginname', 'coursereport_' . $report), 'moodle/site:config');
+            // settings.php may create a subcategory or unset the settings completely
+            include($file);
+            if ($settings) {
+                $pages[] = $settings;
+            }
+        }
+    }
+    if (!empty($pages)) {
+        $ADMIN->add('modules', new admin_category('coursereports', get_string('coursereports')));
+        foreach ($pages as $page) {
+            $ADMIN->add('coursereports', $page);
+        }
+    }
+}
+
+// Now add reports
 foreach (get_plugin_list('report') as $plugin => $plugindir) {
     $settings_path = "$plugindir/settings.php";
     if (file_exists($settings_path)) {

admin/settings/security.php

@@ -16,6 +16,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $temp->add(new admin_setting_configcheckbox('protectusernames', get_string('protectusernames', 'admin'), get_string('configprotectusernames', 'admin'), 1));
     $temp->add(new admin_setting_configcheckbox('forcelogin', get_string('forcelogin', 'admin'), get_string('configforcelogin', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('forceloginforprofiles', get_string('forceloginforprofiles', 'admin'), get_string('configforceloginforprofiles', 'admin'), 1));
+    $temp->add(new admin_setting_configcheckbox('forceloginforprofileimage', get_string('forceloginforprofileimage', 'admin'), get_string('forceloginforprofileimage_help', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('opentogoogle', get_string('opentogoogle', 'admin'), get_string('configopentogoogle', 'admin'), 0));
     $temp->add(new admin_setting_pickroles('profileroles',
         get_string('profileroles','admin'),
@@ -51,8 +52,9 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
                                               'lastname firstname' => get_string('lastname').' + '.get_string('firstname'),
                                               'firstname' => get_string('firstname'))));
     $temp->add(new admin_setting_configcheckbox('extendedusernamechars', get_string('extendedusernamechars', 'admin'), get_string('configextendedusernamechars', 'admin'), 0));
-    $temp->add(new admin_setting_configtext('sitepolicy', get_string('sitepolicy', 'admin'), get_string('configsitepolicy', 'admin'), '', PARAM_RAW));
-    $temp->add(new admin_setting_configcheckbox('usetags', get_string('usetags','admin'),get_string('configusetags', 'admin'),'1'));
+    $temp->add(new admin_setting_configtext('sitepolicy', get_string('sitepolicy', 'admin'), get_string('sitepolicy_help', 'admin'), '', PARAM_RAW));
+    $temp->add(new admin_setting_configtext('sitepolicyguest', get_string('sitepolicyguest', 'admin'), get_string('sitepolicyguest_help', 'admin'), (isset($CFG->sitepolicy) ? $CFG->sitepolicy : ''), PARAM_RAW));
+    $temp->add(new admin_setting_configcheckbox('extendedusernamechars', get_string('extendedusernamechars', 'admin'), get_string('configextendedusernamechars', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('keeptagnamecase', get_string('keeptagnamecase','admin'),get_string('configkeeptagnamecase', 'admin'),'1'));
 
     $temp->add(new admin_setting_configcheckbox('profilesforenrolledusersonly', get_string('profilesforenrolledusersonly','admin'),get_string('configprofilesforenrolledusersonly', 'admin'),'1'));
@@ -70,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);
 
 
@@ -81,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);
 
 

admin/settings/server.php

@@ -12,6 +12,7 @@ $temp->add(new admin_setting_configselect('gdversion', get_string('gdversion','a
                                                                                                                                                           '2' => get_string('gd2'))));
 $temp->add(new admin_setting_configexecutable('pathtodu', get_string('pathtodu', 'admin'), get_string('configpathtodu', 'admin'), ''));
 $temp->add(new admin_setting_configexecutable('aspellpath', get_string('aspellpath', 'admin'), get_string('edhelpaspellpath'), ''));
+$temp->add(new admin_setting_configexecutable('pathtodot', get_string('pathtodot', 'admin'), get_string('pathtodot_help', 'admin'), ''));
 $ADMIN->add('server', $temp);
 
 
@@ -72,6 +73,16 @@ $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'));
@@ -175,6 +186,8 @@ $temp->add(new admin_setting_configselect('deleteincompleteusers', get_string('d
                                                                                                                                                                     48 => get_string('numdays', '', 2),
                                                                                                                                                                     24 => get_string('numdays', '', 1))));
 
+$temp->add(new admin_setting_configcheckbox('logguests', get_string('logguests', 'admin'),
+                                            get_string('logguests_help', 'admin'), 1));
 $temp->add(new admin_setting_configselect('loglifetime', get_string('loglifetime', 'admin'), get_string('configloglifetime', 'admin'), 0, array(0 => get_string('neverdeletelogs'),
                                                                                                                                                 1000 => get_string('numdays', '', 1000),
                                                                                                                                                 365 => get_string('numdays', '', 365),
@@ -190,7 +203,7 @@ $temp->add(new admin_setting_configselect('loglifetime', get_string('loglifetime
 
 
 $temp->add(new admin_setting_configcheckbox('disablegradehistory', get_string('disablegradehistory', 'grades'),
-                                            get_string('disablegradehistory_help', 'grades'), 0, PARAM_INT));
+                                            get_string('disablegradehistory_help', 'grades'), 0));
 
 $temp->add(new admin_setting_configselect('gradehistorylifetime', get_string('gradehistorylifetime', 'grades'),
                                           get_string('gradehistorylifetime_help', 'grades'), 0, array(0 => get_string('neverdeletehistory', 'grades'),
@@ -214,6 +227,8 @@ $ADMIN->add('server', new admin_externalpage('phpinfo', get_string('phpinfo'), "
 // "performance" settingpage
 $temp = new admin_settingpage('performance', get_string('performance', 'admin'));
 
+$temp->add(new admin_setting_configtext('numcoursesincombo', get_string('numcoursesincombo', 'admin'), get_string('numcoursesincombo_help', 'admin'), 500));
+
 $temp->add(new admin_setting_configselect('extramemorylimit', get_string('extramemorylimit', 'admin'),
                                           get_string('configextramemorylimit', 'admin'), '512M',
                                           // if this option is set to 0, default 128M will be used
@@ -226,6 +241,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'), '',
@@ -253,17 +270,6 @@ $ADMIN->add('server', $temp);
 
 
 $ADMIN->add('server', new admin_externalpage('adminregistration', get_string('registration','admin'), "$CFG->wwwroot/$CFG->admin/registration/index.php"));
-
-$dbfamily = $DB->get_dbfamily();
-
-if ($dbfamily === 'mysql') {
-    if (file_exists("$CFG->dirroot/$CFG->admin/mysql/frame.php")) {
-        $ADMIN->add('server', new admin_externalpage('database', get_string('managedatabase'), "$CFG->wwwroot/$CFG->admin/mysql/frame.php"));
-    }
-} else if ($dbfamily === 'postgres') {
-    if (file_exists("$CFG->dirroot/$CFG->admin/pgsql/frame.php")) {
-        $ADMIN->add('server', new admin_externalpage('database', get_string('managedatabase'), "$CFG->wwwroot/$CFG->admin/pgsql/frame.php"));
-    }
-}
+$ADMIN->add('root', new admin_externalpage('bloglevelupgrade', get_string('bloglevelupgrade', 'admin'), $CFG->wwwroot.'/'.$CFG->admin.'/blocklevelupgrade.php', 'moodle/site:config', true));
 
 } // end of speedup

admin/settings/subsystems.php

@@ -15,6 +15,11 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
 
     $optionalsubsystems->add(new admin_setting_configcheckbox('messaging', get_string('messaging', 'admin'), get_string('configmessaging','admin'), 1));
 
+    $optionalsubsystems->add(new admin_setting_configcheckbox('messaginghidereadnotifications', get_string('messaginghidereadnotifications', 'admin'), get_string('configmessaginghidereadnotifications','admin'), 0));
+
+    $options = array(DAYSECS=>get_string('secondstotime86400'), WEEKSECS=>get_string('secondstotime604800'), 2620800=>get_string('nummonths', 'moodle', 1), 15724800=>get_string('nummonths', 'moodle', 6),0=>get_string('never'));
+    $optionalsubsystems->add(new admin_setting_configselect('messagingdeletereadnotificationsdelay', get_string('messagingdeletereadnotificationsdelay', 'admin'), get_string('configmessagingdeletereadnotificationsdelay', 'admin'), 604800, $options));
+
     $optionalsubsystems->add(new admin_setting_configcheckbox('enablestats', get_string('enablestats', 'admin'), get_string('configenablestats', 'admin'), 0));
 
     $optionalsubsystems->add(new admin_setting_configcheckbox('enablerssfeeds', get_string('enablerssfeeds', 'admin'), get_string('configenablerssfeeds', 'admin'), 0));
@@ -32,13 +37,10 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $optionalsubsystems->add(new admin_setting_configcheckbox('enablecompletion',
         get_string('enablecompletion','completion'),
         get_string('configenablecompletion','completion'), 0));
-    $optionalsubsystems->add(new admin_setting_pickroles('progresstrackedroles',
-        get_string('progresstrackedroles','completion'),
-        get_string('configprogresstrackedroles', 'completion'),
-        array('student')));
-    $optionalsubsystems->add(new admin_setting_configcheckbox('enableavailability',
+    $optionalsubsystems->add($checkbox = new admin_setting_configcheckbox('enableavailability',
         get_string('enableavailability','condition'),
         get_string('configenableavailability','condition'), 0));
+    $checkbox->set_affects_modinfo(true);
 
     $optionalsubsystems->add(new admin_setting_configcheckbox('enableplagiarism', get_string('enableplagiarism','plagiarism'), get_string('configenableplagiarism','plagiarism'), 0));
 }

admin/settings/users.php

@@ -38,17 +38,18 @@ if ($hassiteconfig
     if ($ADMIN->fulltree) {
         if (!during_initial_install()) {
             $context = get_context_instance(CONTEXT_SYSTEM);
-            $allroles        = array();
-            $generalroles    = array();
+
+            $otherroles      = array();
             $guestroles      = array();
             $userroles       = array();
-            $studentroles    = array();
-            $teacherroles    = array();
             $creatornewroles = array();
 
+            $defaultteacherid = null;
+            $defaultuserid    = null;
+            $defaultguestid   = null;
+
             foreach (get_all_roles() as $role) {
                 $rolename = strip_tags(format_string($role->name)) . ' ('. $role->shortname . ')';
-                $allroles[$role->id] = $rolename;
                 switch ($role->archetype) {
                     case 'manager':
                         $creatornewroles[$role->id] = $rolename;
@@ -56,58 +57,55 @@ if ($hassiteconfig
                     case 'coursecreator':
                         break;
                     case 'editingteacher':
-                        $teacherroles[$role->id] = $rolename;
+                        $defaultteacherid = isset($defaultteacherid) ? $defaultteacherid : $role->id;
                         $creatornewroles[$role->id] = $rolename;
                         break;
                     case 'teacher':
                         $creatornewroles[$role->id] = $rolename;
                         break;
                     case 'student':
-                        $studentroles[$role->id] = $rolename;
                         break;
                     case 'guest':
+                        $defaultguestid = isset($defaultguestid) ? $defaultguestid : $role->id;
                         $guestroles[$role->id] = $rolename;
                         break;
                     case 'user':
+                        $defaultuserid = isset($defaultuserid) ? $defaultuserid : $role->id;
                         $userroles[$role->id] = $rolename;
                         break;
                     case 'frontpage':
                         break;
                     default:
                         $creatornewroles[$role->id] = $rolename;
-                        $generalroles[$role->id] = $rolename;
+                        $otherroles[$role->id] = $rolename;
                         break;
                 }
             }
 
-            reset($guestroles);
-            $defaultguestid = key($guestroles);
-            reset($studentroles);
-            $defaultstudentid = key($studentroles);
-            reset($teacherroles);
-            $defaultteacherid = key($teacherroles);
+            if (empty($guestroles)) {
+                $guestroles[0] = get_string('none');
+                $defaultguestid = 0;
+            }
 
-            if ($userroles) {
-                reset($userroles);
-                $defaultuserid = key($userroles);
-            } else {
-                $userroles = array('0'=>get_string('none'));
+            if (empty($userroles)) {
+                $userroles[0] = get_string('none');
                 $defaultuserid = 0;
             }
 
             $temp->add(new admin_setting_configselect('notloggedinroleid', get_string('notloggedinroleid', 'admin'),
-                          get_string('confignotloggedinroleid', 'admin'), $defaultguestid, ($guestroles + $generalroles)));
+                          get_string('confignotloggedinroleid', 'admin'), $defaultguestid, ($guestroles + $otherroles)));
             $temp->add(new admin_setting_configselect('guestroleid', get_string('guestroleid', 'admin'),
-                          get_string('configguestroleid', 'admin'), $defaultguestid, ($guestroles + $generalroles)));
+                          get_string('guestroleid_help', 'admin'), $defaultguestid, ($guestroles + $otherroles)));
             $temp->add(new admin_setting_configselect('defaultuserroleid', get_string('defaultuserroleid', 'admin'),
-                          get_string('configdefaultuserroleid', 'admin'), $defaultuserid, ($userroles + $generalroles)));
-        }
-
-        $temp->add(new admin_setting_configcheckbox('nodefaultuserrolelists', get_string('nodefaultuserrolelists', 'admin'), get_string('confignodefaultuserrolelists', 'admin'), 0));
-
-        if (!during_initial_install()) {
+                          get_string('configdefaultuserroleid', 'admin'), $defaultuserid, ($userroles + $otherroles)));
             $temp->add(new admin_setting_configselect('creatornewroleid', get_string('creatornewroleid', 'admin'),
-                          get_string('configcreatornewroleid', 'admin'), $defaultteacherid, $creatornewroles));
+                          get_string('creatornewroleid_help', 'admin'), $defaultteacherid, $creatornewroles));
+
+            // release memory
+            unset($otherroles);
+            unset($guestroles);
+            unset($userroles);
+            unset($creatornewroles);
         }
 
         $temp->add(new admin_setting_configcheckbox('autologinguests', get_string('autologinguests', 'admin'), get_string('configautologinguests', 'admin'), 0));

admin/uploadpicture.php

@@ -68,10 +68,7 @@ if ($formdata = $mform->get_data()) {
         // that we'll take longer, and that the process should be recycled soon
         // to free up memory.
         @set_time_limit(0);
-        @raise_memory_limit("192M");
-        if (function_exists('apache_child_terminate')) {
-            @apache_child_terminate();
-        }
+        raise_memory_limit(MEMORY_EXTRA);
 
         // Create a unique temporary directory, to process the zip file
         // contents.
@@ -82,7 +79,9 @@ if ($formdata = $mform->get_data()) {
             echo $OUTPUT->notification(get_string('uploadpicture_cannotmovezip','admin'));
             @remove_dir($zipdir);
         } else {
-            if (!unzip_file($dstfile, $zipdir, false)) {
+            $fp = get_file_packer('application/zip');
+            $unzipresult = $fp->extract_to_pathname($dstfile, $zipdir);
+            if (!$unzipresult) {
                 echo $OUTPUT->notification(get_string('uploadpicture_cannotunzip','admin'));
                 @remove_dir($zipdir);
             } else {

admin/uploaduser_form.php

@@ -1,16 +1,44 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-if (!defined('MOODLE_INTERNAL')) {
-    die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
-}
+/**
+ * Bulk user upload forms
+ *
+ * @package    core
+ * @subpackage admin
+ * @copyright  2007 Dan Poltawski
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
 
 require_once $CFG->libdir.'/formslib.php';
 
-class admin_uploaduser_form1 extends moodleform {
-    function definition (){
-        global $CFG, $USER;
 
-        $mform =& $this->_form;
+/**
+ * Upload a file CVS file with user information.
+ *
+ * @package    core
+ * @subpackage admin
+ * @copyright  2007 Petr Skoda  {@link http://skodak.org}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class admin_uploaduser_form1 extends moodleform {
+    function definition () {
+        $mform = $this->_form;
 
         $mform->addElement('header', 'settingsheader', get_string('upload'));
 
@@ -36,69 +64,90 @@ class admin_uploaduser_form1 extends moodleform {
         $mform->addElement('select', 'previewrows', get_string('rowpreviewnum', 'admin'), $choices);
         $mform->setType('previewrows', PARAM_INT);
 
-        $choices = array(UU_ADDNEW    => get_string('uuoptype_addnew', 'admin'),
-                         UU_ADDINC    => get_string('uuoptype_addinc', 'admin'),
-                         UU_ADD_UPDATE => get_string('uuoptype_addupdate', 'admin'),
-                         UU_UPDATE     => get_string('uuoptype_update', 'admin'));
-        $mform->addElement('select', 'uutype', get_string('uuoptype', 'admin'), $choices);
-
         $this->add_action_buttons(false, get_string('uploadusers', 'admin'));
     }
 }
 
+
+/**
+ * Specify user upload details
+ *
+ * @package    core
+ * @subpackage admin
+ * @copyright  2007 Petr Skoda  {@link http://skodak.org}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 class admin_uploaduser_form2 extends moodleform {
-    function definition (){
+    function definition () {
         global $CFG, $USER;
 
-        $mform   =& $this->_form;
-        $columns =& $this->_customdata;
+        $mform   = $this->_form;
+        $columns = $this->_customdata['columns'];
+        $data    = $this->_customdata['data'];
 
         // I am the template user, why should it be the administrator? we have roles now, other ppl may use this script ;-)
         $templateuser = $USER;
 
         // upload settings and file
         $mform->addElement('header', 'settingsheader', get_string('settings'));
-        $mform->addElement('static', 'uutypelabel', get_string('uuoptype', 'admin') );
+
+        $choices = array(UU_USER_ADDNEW     => get_string('uuoptype_addnew', 'admin'),
+                         UU_USER_ADDINC     => get_string('uuoptype_addinc', 'admin'),
+                         UU_USER_ADD_UPDATE => get_string('uuoptype_addupdate', 'admin'),
+                         UU_USER_UPDATE     => get_string('uuoptype_update', 'admin'));
+        $mform->addElement('select', 'uutype', get_string('uuoptype', 'admin'), $choices);
 
         $choices = array(0 => get_string('infilefield', 'auth'), 1 => get_string('createpasswordifneeded', 'auth'));
         $mform->addElement('select', 'uupasswordnew', get_string('uupasswordnew', 'admin'), $choices);
-        $mform->setDefault('uupasswordnew', 0);
-        $mform->disabledIf('uupasswordnew', 'uutype', 'eq', UU_UPDATE);
+        $mform->setDefault('uupasswordnew', 1);
+        $mform->disabledIf('uupasswordnew', 'uutype', 'eq', UU_USER_UPDATE);
 
-        $choices = array(0 => get_string('nochanges', 'admin'),
-                         1 => get_string('uuupdatefromfile', 'admin'),
-                         2 => get_string('uuupdateall', 'admin'),
-                         3 => get_string('uuupdatemissing', 'admin'));
+        $choices = array(UU_UPDATE_NOCHANGES    => get_string('nochanges', 'admin'),
+                         UU_UPDATE_FILEOVERRIDE => get_string('uuupdatefromfile', 'admin'),
+                         UU_UPDATE_ALLOVERRIDE  => get_string('uuupdateall', 'admin'),
+                         UU_UPDATE_MISSING      => get_string('uuupdatemissing', 'admin'));
         $mform->addElement('select', 'uuupdatetype', get_string('uuupdatetype', 'admin'), $choices);
-        $mform->setDefault('uuupdatetype', 0);
-        $mform->disabledIf('uuupdatetype', 'uutype', 'eq', UU_ADDNEW);
-        $mform->disabledIf('uuupdatetype', 'uutype', 'eq', UU_ADDINC);
+        $mform->setDefault('uuupdatetype', UU_UPDATE_NOCHANGES);
+        $mform->disabledIf('uuupdatetype', 'uutype', 'eq', UU_USER_ADDNEW);
+        $mform->disabledIf('uuupdatetype', 'uutype', 'eq', UU_USER_ADDINC);
 
         $choices = array(0 => get_string('nochanges', 'admin'), 1 => get_string('update'));
         $mform->addElement('select', 'uupasswordold', get_string('uupasswordold', 'admin'), $choices);
         $mform->setDefault('uupasswordold', 0);
-        $mform->disabledIf('uupasswordold', 'uutype', 'eq', UU_ADDNEW);
-        $mform->disabledIf('uupasswordold', 'uutype', 'eq', UU_ADDINC);
+        $mform->disabledIf('uupasswordold', 'uutype', 'eq', UU_USER_ADDNEW);
+        $mform->disabledIf('uupasswordold', 'uutype', 'eq', UU_USER_ADDINC);
         $mform->disabledIf('uupasswordold', 'uuupdatetype', 'eq', 0);
         $mform->disabledIf('uupasswordold', 'uuupdatetype', 'eq', 3);
 
+        $choices = array(UU_PWRESET_WEAK => get_string('usersweakpassword', 'admin'),
+                         UU_PWRESET_NONE => get_string('none'),
+                         UU_PWRESET_ALL  => get_string('all'));
+        if (empty($CFG->passwordpolicy)) {
+            unset($choices[UU_PWRESET_WEAK]);
+        }
+        $mform->addElement('select', 'uuforcepasswordchange', get_string('forcepasswordchange', 'core'), $choices);
+
+
         $mform->addElement('selectyesno', 'uuallowrenames', get_string('allowrenames', 'admin'));
         $mform->setDefault('uuallowrenames', 0);
-        $mform->disabledIf('uuallowrenames', 'uutype', 'eq', UU_ADDNEW);
-        $mform->disabledIf('uuallowrenames', 'uutype', 'eq', UU_ADDINC);
+        $mform->disabledIf('uuallowrenames', 'uutype', 'eq', UU_USER_ADDNEW);
+        $mform->disabledIf('uuallowrenames', 'uutype', 'eq', UU_USER_ADDINC);
 
         $mform->addElement('selectyesno', 'uuallowdeletes', get_string('allowdeletes', 'admin'));
         $mform->setDefault('uuallowdeletes', 0);
-        $mform->disabledIf('uuallowdeletes', 'uutype', 'eq', UU_ADDNEW);
-        $mform->disabledIf('uuallowdeletes', 'uutype', 'eq', UU_ADDINC);
+        $mform->disabledIf('uuallowdeletes', 'uutype', 'eq', UU_USER_ADDNEW);
+        $mform->disabledIf('uuallowdeletes', 'uutype', 'eq', UU_USER_ADDINC);
 
         $mform->addElement('selectyesno', 'uunoemailduplicates', get_string('uunoemailduplicates', 'admin'));
         $mform->setDefault('uunoemailduplicates', 1);
 
-        $choices = array(0 => get_string('no'),
-                         1 => get_string('uubulknew', 'admin'),
-                         2 => get_string('uubulkupdated', 'admin'),
-                         3 => get_string('uubulkall', 'admin'));
+        $mform->addElement('selectyesno', 'uustandardusernames', get_string('uustandardusernames', 'admin'));
+        $mform->setDefault('uustandardusernames', 1);
+
+        $choices = array(UU_BULK_NONE    => get_string('no'),
+                         UU_BULK_NEW     => get_string('uubulknew', 'admin'),
+                         UU_BULK_UPDATED => get_string('uubulkupdated', 'admin'),
+                         UU_BULK_ALL     => get_string('uubulkall', 'admin'));
         $mform->addElement('select', 'uubulk', get_string('uubulk', 'admin'), $choices);
         $mform->setDefault('uubulk', 0);
 
@@ -152,25 +201,26 @@ class admin_uploaduser_form2 extends moodleform {
         // default values
         $mform->addElement('header', 'defaultheader', get_string('defaultvalues', 'admin'));
 
-        $mform->addElement('text', 'username', get_string('username'), 'size="20"');
+        $mform->addElement('text', 'username', get_string('uuusernametemplate', 'admin'), 'size="20"');
         $mform->addRule('username', get_string('requiredtemplate', 'admin'), 'required', null, 'client');
+        $mform->disabledIf('username', 'uutype', 'eq', UU_USER_ADD_UPDATE);
+        $mform->disabledIf('username', 'uutype', 'eq', UU_USER_UPDATE);
+
+        $mform->addElement('text', 'email', get_string('email'), 'maxlength="100" size="30"');
+        $mform->disabledIf('email', 'uutype', 'eq', UU_USER_ADD_UPDATE);
+        $mform->disabledIf('email', 'uutype', 'eq', UU_USER_UPDATE);
 
         // only enabled and known to work plugins
-        $choices = uu_allowed_auths();
+        $choices = uu_supported_auths();
         $mform->addElement('select', 'auth', get_string('chooseauthmethod','auth'), $choices);
         $mform->setDefault('auth', 'manual'); // manual is a sensible backwards compatible default
         $mform->addHelpButton('auth', 'chooseauthmethod', 'auth');
         $mform->setAdvanced('auth');
 
-        $mform->addElement('text', 'email', get_string('email'), 'maxlength="100" size="30"');
-
         $choices = array(0 => get_string('emaildisplayno'), 1 => get_string('emaildisplayyes'), 2 => get_string('emaildisplaycourse'));
         $mform->addElement('select', 'maildisplay', get_string('emaildisplay'), $choices);
         $mform->setDefault('maildisplay', 2);
 
-        $choices = array(0 => get_string('emailenable'), 1 => get_string('emaildisable'));
-        $mform->addElement('select', 'emailstop', get_string('emailactive'), $choices);
-
         $choices = array(0 => get_string('textformat'), 1 => get_string('htmlformat'));
         $mform->addElement('select', 'mailformat', get_string('emailformat'), $choices);
         $mform->setDefault('mailformat', 1);
@@ -181,7 +231,7 @@ class admin_uploaduser_form2 extends moodleform {
         $mform->setDefault('maildigest', 0);
         $mform->setAdvanced('maildigest');
 
-        $choices = array(0 => get_string('autosubscribeyes'), 1 => get_string('autosubscribeno'));
+        $choices = array(1 => get_string('autosubscribeyes'), 0 => get_string('autosubscribeno'));
         $mform->addElement('select', 'autosubscribe', get_string('autosubscribe'), $choices);
         $mform->setDefault('autosubscribe', 1);
 
@@ -209,10 +259,19 @@ class admin_uploaduser_form2 extends moodleform {
 
         $mform->addElement('text', 'city', get_string('city'), 'maxlength="100" size="25"');
         $mform->setType('city', PARAM_MULTILANG);
-        $mform->setDefault('city', $templateuser->city);
+        if (empty($CFG->defaultcity)) {
+            $mform->setDefault('city', $templateuser->city);
+        } else {
+            $mform->setDefault('city', $CFG->defaultcity);
+        }
+        $mform->addRule('city', get_string('required'), 'required');
 
         $mform->addElement('select', 'country', get_string('selectacountry'), get_string_manager()->get_list_of_countries());
-        $mform->setDefault('country', $templateuser->country);
+        if (empty($CFG->country)) {
+            $mform->setDefault('country', $templateuser->country);
+        } else {
+            $mform->setDefault('country', $CFG->country);
+        }
         $mform->setAdvanced('country');
 
         $choices = get_list_of_timezones();
@@ -267,27 +326,30 @@ class admin_uploaduser_form2 extends moodleform {
         $mform->addElement('hidden', 'previewrows');
         $mform->setType('previewrows', PARAM_INT);
 
-        $mform->addElement('hidden', 'readcount');
-        $mform->setType('readcount', PARAM_INT);
-
-        $mform->addElement('hidden', 'uutype');
-        $mform->setType('uutype', PARAM_INT);
-
         $this->add_action_buttons(true, get_string('uploadusers', 'admin'));
+
+        $this->set_data($data);
     }
 
     /**
      * Form tweaks that depend on current data.
      */
     function definition_after_data() {
-        $mform   =& $this->_form;
-        $columns =& $this->_customdata;
+        $mform   = $this->_form;
+        $columns = $this->_customdata['columns'];
 
         foreach ($columns as $column) {
             if ($mform->elementExists($column)) {
                 $mform->removeElement($column);
             }
         }
+
+        if (!in_array('password', $columns)) {
+            // password resetting makes sense only if password specified in csv file
+            if ($mform->elementExists('uuforcepasswordchange')) {
+                $mform->removeElement('uuforcepasswordchange');
+            }
+        }
     }
 
     /**
@@ -295,19 +357,19 @@ class admin_uploaduser_form2 extends moodleform {
      */
     function validation($data, $files) {
         $errors = parent::validation($data, $files);
-        $columns =& $this->_customdata;
+        $columns = $this->_customdata['columns'];
         $optype  = $data['uutype'];
 
         // detect if password column needed in file
         if (!in_array('password', $columns)) {
             switch ($optype) {
-                case UU_UPDATE:
+                case UU_USER_UPDATE:
                     if (!empty($data['uupasswordold'])) {
                         $errors['uupasswordold'] = get_string('missingfield', 'error', 'password');
                     }
                     break;
 
-                case UU_ADD_UPDATE:
+                case UU_USER_ADD_UPDATE:
                     if (empty($data['uupasswordnew'])) {
                         $errors['uupasswordnew'] = get_string('missingfield', 'error', 'password');
                     }
@@ -316,8 +378,12 @@ class admin_uploaduser_form2 extends moodleform {
                     }
                     break;
 
-                case UU_ADDNEW:
-                case UU_ADDINC:
+                case UU_USER_ADDNEW:
+                    if (empty($data['uupasswordnew'])) {
+                        $errors['uupasswordnew'] = get_string('missingfield', 'error', 'password');
+                    }
+                    break;
+                case UU_USER_ADDINC:
                     if (empty($data['uupasswordnew'])) {
                         $errors['uupasswordnew'] = get_string('missingfield', 'error', 'password');
                     }
@@ -326,7 +392,7 @@ class admin_uploaduser_form2 extends moodleform {
         }
 
         // look for other required data
-        if ($optype != UU_UPDATE) {
+        if ($optype != UU_USER_UPDATE) {
             if (!in_array('firstname', $columns)) {
                 $errors['uutype'] = get_string('missingfield', 'error', 'firstname');
             }
@@ -343,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;
@@ -360,7 +422,7 @@ class admin_uploaduser_form2 extends moodleform {
     function get_data() {
         $data = parent::get_data();
 
-        if ($data !== null) {
+        if ($data !== null and isset($data->description)) {
             $data->descriptionformat = $data->description['format'];
             $data->description = $data->description['text'];
         }
@@ -368,11 +430,3 @@ class admin_uploaduser_form2 extends moodleform {
         return $data;
     }
 }
-
-class admin_uploaduser_form3 extends moodleform {
-    function definition (){
-        global $CFG, $USER;
-        $mform =& $this->_form;
-        $this->add_action_buttons(false, get_string('uploadnewfile'));
-    }
-}

admin/uploaduserlib.php

@@ -0,0 +1,368 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Bulk user registration functions
+ *
+ * @package    core
+ * @subpackage admin
+ * @copyright  2004 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+define('UU_USER_ADDNEW', 0);
+define('UU_USER_ADDINC', 1);
+define('UU_USER_ADD_UPDATE', 2);
+define('UU_USER_UPDATE', 3);
+
+define('UU_UPDATE_NOCHANGES', 0);
+define('UU_UPDATE_FILEOVERRIDE', 1);
+define('UU_UPDATE_ALLOVERRIDE', 2);
+define('UU_UPDATE_MISSING', 3);
+
+define('UU_BULK_NONE', 0);
+define('UU_BULK_NEW', 1);
+define('UU_BULK_UPDATED', 2);
+define('UU_BULK_ALL', 3);
+
+define('UU_PWRESET_NONE', 0);
+define('UU_PWRESET_WEAK', 1);
+define('UU_PWRESET_ALL', 2);
+
+/**
+ * Tracking of processed users.
+ *
+ * This class prints user information into a html table.
+ *
+ * @package    core
+ * @subpackage admin
+ * @copyright  2007 Petr Skoda  {@link http://skodak.org}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class uu_progress_tracker {
+    private $_row;
+    public $columns = array('status', 'line', 'id', 'username', 'firstname', 'lastname', 'email', 'password', 'auth', 'enrolments', 'deleted');
+
+    /**
+     * Print table header.
+     * @return void
+     */
+    public function start() {
+        $ci = 0;
+        echo '<table id="uuresults" class="generaltable boxaligncenter flexible-wrap" summary="'.get_string('uploadusersresult', 'admin').'">';
+        echo '<tr class="heading r0">';
+        echo '<th class="header c'.$ci++.'" scope="col">'.get_string('status').'</th>';
+        echo '<th class="header c'.$ci++.'" scope="col">'.get_string('uucsvline', 'admin').'</th>';
+        echo '<th class="header c'.$ci++.'" scope="col">ID</th>';
+        echo '<th class="header c'.$ci++.'" scope="col">'.get_string('username').'</th>';
+        echo '<th class="header c'.$ci++.'" scope="col">'.get_string('firstname').'</th>';
+        echo '<th class="header c'.$ci++.'" scope="col">'.get_string('lastname').'</th>';
+        echo '<th class="header c'.$ci++.'" scope="col">'.get_string('email').'</th>';
+        echo '<th class="header c'.$ci++.'" scope="col">'.get_string('password').'</th>';
+        echo '<th class="header c'.$ci++.'" scope="col">'.get_string('authentication').'</th>';
+        echo '<th class="header c'.$ci++.'" scope="col">'.get_string('enrolments', 'enrol').'</th>';
+        echo '<th class="header c'.$ci++.'" scope="col">'.get_string('delete').'</th>';
+        echo '</tr>';
+        $this->_row = null;
+    }
+
+    /**
+     * Flush previous line and start a new one.
+     * @return void
+     */
+    public function flush() {
+        if (empty($this->_row) or empty($this->_row['line']['normal'])) {
+            // Nothing to print - each line has to have at least number
+            $this->_row = array();
+            foreach ($this->columns as $col) {
+                $this->_row[$col] = array('normal'=>'', 'info'=>'', 'warning'=>'', 'error'=>'');
+            }
+            return;
+        }
+        $ci = 0;
+        $ri = 1;
+        echo '<tr class="r'.$ri.'">';
+        foreach ($this->_row as $key=>$field) {
+            foreach ($field as $type=>$content) {
+                if ($field[$type] !== '') {
+                    $field[$type] = '<span class="uu'.$type.'">'.$field[$type].'</span>';
+                } else {
+                    unset($field[$type]);
+                }
+            }
+            echo '<td class="cell c'.$ci++.'">';
+            if (!empty($field)) {
+                echo implode('<br />', $field);
+            } else {
+                echo '&nbsp;';
+            }
+            echo '</td>';
+        }
+        echo '</tr>';
+        foreach ($this->columns as $col) {
+            $this->_row[$col] = array('normal'=>'', 'info'=>'', 'warning'=>'', 'error'=>'');
+        }
+    }
+
+    /**
+     * Add tracking info
+     * @param string $col name of column
+     * @param string $msg message
+     * @param string $level 'normal', 'warning' or 'error'
+     * @param bool $merge true means add as new line, false means override all previous text of the same type
+     * @return void
+     */
+    public function track($col, $msg, $level = 'normal', $merge = true) {
+        if (empty($this->_row)) {
+            $this->flush(); //init arrays
+        }
+        if (!in_array($col, $this->columns)) {
+            debugging('Incorrect column:'.$col);
+            return;
+        }
+        if ($merge) {
+            if ($this->_row[$col][$level] != '') {
+                $this->_row[$col][$level] .='<br />';
+            }
+            $this->_row[$col][$level] .= $msg;
+        } else {
+            $this->_row[$col][$level] = $msg;
+        }
+    }
+
+    /**
+     * Print the table end
+     * @return void
+     */
+    public function close() {
+        $this->flush();
+        echo '</table>';
+    }
+}
+
+/**
+ * Validation callback function - verified the column line of csv file.
+ * Converts standard column names to lowercase.
+ * @param csv_import_reader $cir
+ * @param array $stdfields standard user fields
+ * @param array $profilefields custom profile fields
+ * @param moodle_url $returnurl return url in case of any error
+ * @return array list of fields
+ */
+function uu_validate_user_upload_columns(csv_import_reader $cir, $stdfields, $profilefields, moodle_url $returnurl) {
+    $columns = $cir->get_columns();
+
+    if (empty($columns)) {
+        $cir->close();
+        $cir->cleanup();
+        print_error('cannotreadtmpfile', 'error', $returnurl);
+    }
+    if (count($columns) < 2) {
+        $cir->close();
+        $cir->cleanup();
+        print_error('csvfewcolumns', 'error', $returnurl);
+    }
+
+    $textlib = textlib_get_instance(); // profile fields may contain unicode chars
+
+    // test columns
+    $processed = array();
+    foreach ($columns as $key=>$unused) {
+        $field = $columns[$key];
+        $lcfield = $textlib->strtolower($field);
+        if (in_array($field, $stdfields) or in_array($lcfield, $stdfields)) {
+            // standard fields are only lowercase
+            $newfield = $lcfield;
+
+        } else if (in_array($field, $profilefields)) {
+            // exact profile field name match - these are case sensitive
+            $newfield = $field;
+
+        } else if (in_array($lcfield, $profilefields)) {
+            // hack: somebody wrote uppercase in csv file, but the system knows only lowercase profile field
+            $newfield = $lcfield;
+
+        } else if (preg_match('/^(course|group|type|role|enrolperiod)\d+$/', $lcfield)) {
+            // special fields for enrolments
+            $newfield = $lcfield;
+
+        } else {
+            $cir->close();
+            $cir->cleanup();
+            print_error('invalidfieldname', 'error', $returnurl, $field);
+        }
+        if (in_array($newfield, $processed)) {
+            $cir->close();
+            $cir->cleanup();
+            print_error('duplicatefieldname', 'error', $returnurl, $newfield);
+        }
+        $processed[$key] = $newfield;
+    }
+
+    return $processed;
+}
+
+/**
+ * Increments username - increments trailing number or adds it if not present.
+ * Varifies that the new username does not exist yet
+ * @param string $username
+ * @return incremented username which does not exist yet
+ */
+function uu_increment_username($username) {
+    global $DB, $CFG;
+
+    if (!preg_match_all('/(.*?)([0-9]+)$/', $username, $matches)) {
+        $username = $username.'2';
+    } else {
+        $username = $matches[1][0].($matches[2][0]+1);
+    }
+
+    if ($DB->record_exists('user', array('username'=>$username, 'mnethostid'=>$CFG->mnet_localhost_id))) {
+        return uu_increment_username($username);
+    } else {
+        return $username;
+    }
+}
+
+/**
+ * Check if default field contains templates and apply them.
+ * @param string template - potential tempalte string
+ * @param object user object- we need username, firstname and lastname
+ * @return string field value
+ */
+function uu_process_template($template, $user) {
+    if (is_array($template)) {
+        // hack for for support of text editors with format
+        $t = $template['text'];
+    } else {
+        $t = $template;
+    }
+    if (strpos($t, '%') === false) {
+        return $template;
+    }
+
+    $username  = isset($user->username)  ? $user->username  : '';
+    $firstname = isset($user->firstname) ? $user->firstname : '';
+    $lastname  = isset($user->lastname)  ? $user->lastname  : '';
+
+    $callback = partial('uu_process_template_callback', $username, $firstname, $lastname);
+
+    $result = preg_replace_callback('/(?<!%)%([+-~])?(\d)*([flu])/', $callback, $t);
+
+    if (is_null($result)) {
+        return $template; //error during regex processing??
+    }
+
+    if (is_array($template)) {
+        $template['text'] = $result;
+        return $t;
+    } else {
+        return $result;
+    }
+}
+
+/**
+ * Internal callback function.
+ */
+function uu_process_template_callback($username, $firstname, $lastname, $block) {
+    $textlib = textlib_get_instance();
+
+    switch ($block[3]) {
+        case 'u':
+            $repl = $username;
+            break;
+        case 'f':
+            $repl = $firstname;
+            break;
+        case 'l':
+            $repl = $lastname;
+            break;
+        default:
+            return $block[0];
+    }
+
+    switch ($block[1]) {
+        case '+':
+            $repl = $textlib->strtoupper($repl);
+            break;
+        case '-':
+            $repl = $textlib->strtolower($repl);
+            break;
+        case '~':
+            $repl = $textlib->strtotitle($repl);
+            break;
+    }
+
+    if (!empty($block[2])) {
+        $repl = $textlib->substr($repl, 0 , $block[2]);
+    }
+
+    return $repl;
+}
+
+/**
+ * Returns list of auth plugins that are enabled and known to work.
+ *
+ * If ppl want to use some other auth type they have to include it
+ * in the CSV file next on each line.
+ *
+ * @return array type=>name
+ */
+function uu_supported_auths() {
+    // only following plugins are guaranteed to work properly
+    $whitelist = array('manual', 'nologin', 'none', 'email');
+    $plugins = get_enabled_auth_plugins();
+    $choices = array();
+    foreach ($plugins as $plugin) {
+        if (!in_array($plugin, $whitelist)) {
+            continue;
+        }
+        $choices[$plugin] = get_string('pluginname', "auth_{$plugin}");
+    }
+
+    return $choices;
+}
+
+/**
+ * Returns list of roles that are assignable in courses
+ * @return array
+ */
+function uu_allowed_roles() {
+    // let's cheat a bit, frontpage is guaranteed to exist and has the same list of roles ;-)
+    $roles = get_assignable_roles(get_context_instance(CONTEXT_COURSE, SITEID), ROLENAME_ORIGINALANDSHORT);
+    return array_reverse($roles, true);
+}
+
+/**
+ * Returns mapping of all roles using short role name as index.
+ * @return array
+ */
+function uu_allowed_roles_cache() {
+    $allowedroles = get_assignable_roles(get_context_instance(CONTEXT_COURSE, SITEID), ROLENAME_SHORT);
+    foreach ($allowedroles as $rid=>$rname) {
+        $rolecache[$rid] = new stdClass();
+        $rolecache[$rid]->id   = $rid;
+        $rolecache[$rid]->name = $rname;
+        if (!is_numeric($rname)) { // only non-numeric shortnames are supported!!!
+            $rolecache[$rname] = new stdClass();
+            $rolecache[$rname]->id   = $rid;
+            $rolecache[$rname]->name = $rname;
+        }
+    }
+    return $rolecache;
+}

admin/user.php

@@ -180,7 +180,7 @@
         }
 
         foreach ($users as $key => $user) {
-            if (!empty($user->country)) {
+            if (isset($countries[$user->country])) {
                 $users[$key]->country = $countries[$user->country];
             }
         }

admin/user/lib.php

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

admin/user/user_bulk_confirm.php

@@ -24,19 +24,18 @@ echo $OUTPUT->header();
 
 if ($confirm and confirm_sesskey()) {
     list($in, $params) = $DB->get_in_or_equal($SESSION->bulk_users);
-    if ($rs = $DB->get_recordset_select('user', "id $in", $params, '', 'id, username, secret, confirmed, auth, firstname, lastname')) {
-        foreach ($rs as $user) {
-            if ($user->confirmed) {
-                continue;
-            }
-            $auth = get_auth_plugin($user->auth);
-            $result = $auth->user_confirm($user->username, $user->secret);
-            if ($result != AUTH_CONFIRM_OK && $result != AUTH_CONFIRM_ALREADY) {
-                echo $OUTPUT->notification(get_string('usernotconfirmed', '', fullname($user, true)));
-            }
+    $rs = $DB->get_recordset_select('user', "id $in", $params, '', 'id, username, secret, confirmed, auth, firstname, lastname');
+    foreach ($rs as $user) {
+        if ($user->confirmed) {
+            continue;
+        }
+        $auth = get_auth_plugin($user->auth);
+        $result = $auth->user_confirm($user->username, $user->secret);
+        if ($result != AUTH_CONFIRM_OK && $result != AUTH_CONFIRM_ALREADY) {
+            echo $OUTPUT->notification(get_string('usernotconfirmed', '', fullname($user, true)));
         }
-        $rs->close();
     }
+    $rs->close();
     redirect($return, get_string('changessaved'));
 
 } else {
@@ -45,7 +44,7 @@ if ($confirm and confirm_sesskey()) {
     $usernames = implode(', ', $userlist);
     echo $OUTPUT->heading(get_string('confirmation', 'admin'));
     $formcontinue = new single_button(new moodle_url('user_bulk_confirm.php', array('confirm' => 1)), get_string('yes'));
-    $formcancel = new single_button('user_bulk.php', get_string('no'), 'get');
+    $formcancel = new single_button(new moodle_url('user_bulk.php'), get_string('no'), 'get');
     echo $OUTPUT->confirm(get_string('confirmcheckfull', '', $usernames), $formcontinue, $formcancel);
 }
 

admin/user/user_bulk_delete.php

@@ -25,16 +25,15 @@ echo $OUTPUT->header();
 if ($confirm and confirm_sesskey()) {
 
     list($in, $params) = $DB->get_in_or_equal($SESSION->bulk_users);
-    if ($rs = $DB->get_recordset_select('user', "id $in", $params)) {
-        foreach ($rs as $user) {
-            if (!is_siteadmin($user) and $USER->id != $user->id and delete_user($user)) {
-                unset($SESSION->bulk_users[$user->id]);
-            } else {
-                echo $OUTPUT->notification(get_string('deletednot', '', fullname($user, true)));
-            }
+    $rs = $DB->get_recordset_select('user', "id $in", $params);
+    foreach ($rs as $user) {
+        if (!is_siteadmin($user) and $USER->id != $user->id and delete_user($user)) {
+            unset($SESSION->bulk_users[$user->id]);
+        } else {
+            echo $OUTPUT->notification(get_string('deletednot', '', fullname($user, true)));
         }
-        $rs->close;
     }
+    $rs->close();
     session_gc(); // remove stale sessions
     redirect($return, get_string('changessaved'));
 
@@ -44,7 +43,7 @@ if ($confirm and confirm_sesskey()) {
     $usernames = implode(', ', $userlist);
     echo $OUTPUT->heading(get_string('confirmation', 'admin'));
     $formcontinue = new single_button(new moodle_url('user_bulk_delete.php', array('confirm' => 1)), get_string('yes'));
-    $formcancel = new single_button('user_bulk.php', get_string('no'), 'get');
+    $formcancel = new single_button(new moodle_url('user_bulk.php'), get_string('no'), 'get');
     echo $OUTPUT->confirm(get_string('deletecheckfull', '', $usernames), $formcontinue, $formcancel);
 }
 

admin/user/user_bulk_forcepasswordchange.php

@@ -38,17 +38,16 @@ if ($confirm and confirm_sesskey()) {
     $parts = array_chunk($SESSION->bulk_users, 300);
     foreach ($parts as $users) {
         list($in, $params) = $DB->get_in_or_equal($users);
-        if ($rs = $DB->get_recordset_select('user', "id $in", $params)) {
-            foreach ($rs as $user) {
-                if (!empty($changeable[$user->auth])) {
-                    set_user_preference('auth_forcepasswordchange', 1, $user->id);
-                    unset($SESSION->bulk_users[$user->id]);
-                } else {
-                    echo $OUTPUT->notification(get_string('forcepasswordchangenot', '', fullname($user, true)));
-                }
+        $rs = $DB->get_recordset_select('user', "id $in", $params);
+        foreach ($rs as $user) {
+            if (!empty($changeable[$user->auth])) {
+                set_user_preference('auth_forcepasswordchange', 1, $user->id);
+                unset($SESSION->bulk_users[$user->id]);
+            } else {
+                echo $OUTPUT->notification(get_string('forcepasswordchangenot', '', fullname($user, true)));
             }
-            $rs->close();
         }
+        $rs->close();
     }
     echo $OUTPUT->notification(get_string('changessaved'), 'notifysuccess');
     echo $OUTPUT->continue_button($return);

admin/user/user_bulk_message.php

@@ -25,12 +25,14 @@ if (empty($CFG->messaging)) {
 
 if ($confirm and !empty($msg) and confirm_sesskey()) {
     list($in, $params) = $DB->get_in_or_equal($SESSION->bulk_users);
-    if ($rs = $DB->get_recordset_select('user', "id $in", $params)) {
-        foreach ($rs as $user) {
-            message_post_message($USER, $user, $msg, FORMAT_HTML, 'direct'); // TODO: this is weird, we should support all text formats here
-        }
-        $rs->close();
+    $rs = $DB->get_recordset_select('user', "id $in", $params);
+    foreach ($rs as $user) {
+        //TODO we should probably support all text formats here or only FORMAT_MOODLE
+        //For now bulk messaging is still using the html editor and its supplying html
+        //so we have to use html format for it to be displayed correctly
+        message_post_message($USER, $user, $msg, FORMAT_HTML);
     }
+    $rs->close();
     redirect($return);
 }
 
@@ -55,7 +57,7 @@ if ($msgform->is_cancelled()) {
     echo $OUTPUT->box($msg, 'boxwidthnarrow boxaligncenter generalbox', 'preview'); //TODO: clean once we start using proper text formats here
 
     $formcontinue = new single_button(new moodle_url('user_bulk_message.php', array('confirm' => 1, 'msg' => $msg)), get_string('yes')); //TODO: clean once we start using proper text formats here
-    $formcancel = new single_button('user_bulk.php', get_string('no'), 'get');
+    $formcancel = new single_button(new moodle_url('user_bulk.php'), get_string('no'), 'get');
     echo $OUTPUT->confirm(get_string('confirmmessage', 'bulkusers', $usernames), $formcontinue, $formcancel);
     echo $OUTPUT->footer();
     die;

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

@@ -66,6 +66,7 @@ class external_service_form extends moodleform {
         $mform->addElement('advcheckbox', 'enabled', get_string('enabled', 'webservice'));
         $mform->addElement('advcheckbox', 'restrictedusers',
                 get_string('restrictedusers', 'webservice'));
+        $mform->addHelpButton('restrictedusers', 'restrictedusers', 'webservice');
 
         /// needed to select automatically the 'No required capability" option
         $currentcapabilityexist = false;
@@ -173,7 +174,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,10 +183,12 @@ class web_service_token_form extends moodleform {
 
         if (empty($data->nouserselection)) {
             //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());
+            $users = $DB->get_records_sql($sql, array($CFG->siteguest));
             $options = array();
             foreach ($users as $userid => $user) {
                 $options[$userid] = $user->firstname . " " . $user->lastname;

admin/webservice/protocols.php

@@ -27,13 +27,13 @@ require_once('../../config.php');
 require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->libdir.'/tablelib.php');
 
-$PAGE->set_url('/admin/webservice/protocols.php');
+$PAGE->set_url('/' . $CFG->admin . '/webservice/protocols.php');
 //TODO: disable the blocks here or better make the page layout default to no blocks!
 
 require_login();
 require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
 
-$returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=webserviceprotocols";
+$returnurl = $CFG->wwwroot . "/" . $CFG->admin . "/settings.php?section=webserviceprotocols";
 
 $action     = optional_param('action', '', PARAM_ACTION);
 $webservice = optional_param('webservice', '', PARAM_SAFEDIR);