Moodle release 2.7.1

This catches things like:
 * Malicious equations coming from backup files.
 * Malicious equations in old questions in the database.

.csslintrc

@@ -1,3 +0,0 @@
---errors=errors,duplicate-properties
---warnings=known-properties,display-property-grouping,empty-rules,important
---exclude-list=vendor/,lib/editor/tinymce/,lib/yuilib/,theme/bootstrapbase/style/

.gitignore

@@ -35,4 +35,3 @@ composer.lock
 /lib/yuilib/*/build/*/*-coverage.js
 # lib/yuilib/version/module/module-coverage.js
 /lib/yuilib/*/*/*-coverage.js
-atlassian-ide-plugin.xml

admin/auth_config.php

@@ -64,8 +64,6 @@ echo "<form id=\"authmenu\" method=\"post\" action=\"auth_config.php\">\n";
 echo "<div>\n";
 echo "<input type=\"hidden\" name=\"sesskey\" value=\"".sesskey()."\" />\n";
 echo "<input type=\"hidden\" name=\"auth\" value=\"".$auth."\" />\n";
-// HACK to prevent browsers from automatically inserting the user's password into the wrong fields.
-echo prevent_form_autofill_password();
 
 // auth plugin description
 echo $OUTPUT->box_start();
@@ -144,14 +142,14 @@ function print_auth_lock_options($auth, $user_fields, $helptext, $retrieveopts,
         $fieldname = $field;
         if ($fieldname === 'lang') {
             $fieldname = get_string('language');
+        } elseif (preg_match('/^(.+?)(\d+)$/', $fieldname, $matches)) {
+            $fieldname =  get_string($matches[1]) . ' ' . $matches[2];
+        } elseif ($fieldname == 'url') {
+            $fieldname = get_string('webpage');
         } elseif (!empty($customfields) && in_array($field, $customfields)) {
             // If custom field then pick name from database.
             $fieldshortname = str_replace('profile_field_', '', $fieldname);
             $fieldname = $customfieldname[$fieldshortname]->name;
-        } elseif ($fieldname == 'phone1') {
-            $fieldname = get_string('phone');
-        } elseif ($fieldname == 'url') {
-            $fieldname = get_string('webpage');
         } else {
             $fieldname = get_string($fieldname);
         }

admin/category.php

@@ -67,6 +67,7 @@ if ($data = data_submitted() and confirm_sesskey()) {
         $errormsg = get_string('errorwithsettings', 'admin');
         $firsterror = reset($adminroot->errors);
     }
+    $adminroot = admin_get_root(true); //reload tree
     $settingspage = $adminroot->locate($category, true);
 }
 
@@ -155,4 +156,4 @@ echo $outputhtml;
 echo html_writer::end_tag('fieldset');
 echo html_writer::end_tag('form');
 
-echo $OUTPUT->footer();
+echo $OUTPUT->footer();

admin/cli/check_database_schema.php

@@ -1,76 +0,0 @@
-<?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/>.
-
-/**
- * Validate that the current db structure matches the install.xml files.
- *
- * @package   core
- * @copyright 2014 Totara Learning Solutions Ltd {@link http://www.totaralms.com/}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @author    Petr Skoda <petr.skoda@totaralms.com>
- */
-
-define('CLI_SCRIPT', true);
-
-require(__DIR__ . '/../../config.php');
-require_once($CFG->libdir.'/clilib.php');
-
-$help = "Validate database structure
-
-Options:
--h, --help            Print out this help.
-
-Example:
-\$ sudo -u www-data /usr/bin/php admin/cli/check_database_schema.php
-";
-
-list($options, $unrecognized) = cli_get_params(
-    array(
-        'help' => false,
-    ),
-    array(
-        'h' => 'help',
-    )
-);
-
-if ($options['help']) {
-    echo $help;
-    exit(0);
-}
-
-if (empty($CFG->version)) {
-    echo "Database is not yet installed.\n";
-    exit(2);
-}
-
-$dbmanager = $DB->get_manager();
-$schema = $dbmanager->get_install_xml_schema();
-
-if (!$errors = $dbmanager->check_database_schema($schema)) {
-    echo "Database structure is ok.\n";
-    exit(0);
-}
-
-foreach ($errors as $table => $items) {
-    cli_separator();
-    echo "$table\n";
-    foreach ($items as $item) {
-        echo " * $item\n";
-    }
-}
-cli_separator();
-
-exit(1);

admin/cli/fix_orphaned_question_categories.php

@@ -1,103 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * This script fixes orphaned question categories.
- *
- * Orphaned question categories have had their associated context deleted
- * but the category itself remains in the database with an invalid context.
- *
- * @package    core
- * @subpackage cli
- * @copyright  2013 Tyler Bannister (tyler.bannister@remote-learner.net)
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', true);
-
-require(__DIR__.'/../../config.php');
-require_once($CFG->libdir.'/clilib.php');
-require_once($CFG->libdir.'/questionlib.php');
-
-$long = array('fix'  => false, 'help' => false);
-$short = array('f' => 'fix', 'h' => 'help');
-
-// Now get cli options.
-list($options, $unrecognized) = cli_get_params($long, $short);
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-if ($options['help']) {
-    $help =
-        "Fix orphaned question categories.
-
-        This scripts detects question categories that have had their
-        context deleted, thus severing them from their original purpose.
-
-        This script will find the orphaned categories and delete the unused
-        questions in each category found.  Used questions will not be
-        deleted, instead they will be moved to a rescue question category.
-
-        Options:
-        -h, --help            Print out this help
-        -f, --fix             Fix the orphaned question categories in the DB.
-                              If not specified only check and report problems to STDERR.
-        Example:
-        \$sudo -u www-data /usr/bin/php admin/cli/fix_orphaned_question_categories.php
-        \$sudo -u www-data /usr/bin/php admin/cli/fix_orphaned_question_categories.php -f
-        ";
-
-    echo $help;
-    die;
-}
-
-cli_heading('Checking for orphaned categories');
-
-
-$sql = 'SELECT qc.id, qc.contextid, qc.name
-          FROM {question_categories} qc
-     LEFT JOIN {context} c ON qc.contextid = c.id
-         WHERE c.id IS NULL';
-$categories = $DB->get_recordset_sql($sql);
-
-$i = 0;
-foreach ($categories as $category) {
-    $i += 1;
-    echo "Found orphaned category: {$category->name}\n";
-    if (!empty($options['fix'])) {
-        echo "Cleaning...";
-        // One transaction per category.
-        $transaction = $DB->start_delegated_transaction();
-        question_category_delete_safe($category);
-        $transaction->allow_commit();
-        echo "  Done!\n";
-    }
-}
-
-if (($i > 0) && !empty($options['fix'])) {
-    echo "Found and removed {$i} orphaned question categories\n";
-} else if ($i > 0) {
-    echo "Found {$i} orphaned question categories. To fix, run:\n";
-    echo "\$sudo -u www-data /usr/bin/php admin/cli/fix_orphaned_question_categories.php --fix\n";
-} else {
-    echo "No orphaned question categories found.\n";
-}
-
-
-$categories->close();

admin/cli/mysql_compressed_rows.php

@@ -1,202 +0,0 @@
-<?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/>.
-
-/**
- * MySQL table row compression tool tool.
- *
- * @package   core
- * @copyright 2014 Totara Learning Solutions Ltd {@link http://www.totaralms.com/}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @author    Petr Skoda <petr.skoda@totaralms.com>
- */
-
-define('CLI_SCRIPT', true);
-
-require(dirname(__FILE__).'/../../config.php');
-require_once($CFG->libdir . '/clilib.php');
-
-if ($DB->get_dbfamily() !== 'mysql') {
-    cli_error('This script is used for MySQL databases only.');
-}
-
-$engine = strtolower($DB->get_dbengine());
-if ($engine !== 'innodb' and $engine !== 'xtradb') {
-    cli_error('This script is for MySQL servers using InnoDB or XtraDB engines only.');
-}
-
-list($options, $unrecognized) = cli_get_params(
-    array('help' => false, 'info' => false, 'list' => false, 'fix' => false, 'showsql' => false),
-    array('h' => 'help', 'i' => 'info', 'l' => 'list', 'f' => 'fix', 's' => 'showsql')
-);
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-$help =
-    "Script for detection of row size problems in MySQL InnoDB tables.
-
-By default InnoDB storage table is using legacy Antelope file format
-which has major restriction on database row size.
-Use this script to detect and fix database tables with potential data
-overflow problems.
-
-Options:
--i, --info            Show database information
--l, --list            List problematic tables
--f, --fix             Attempt to fix all tables (requires SUPER privilege)
--s, --showsql         Print SQL statements for fixing of tables
--h, --help            Print out this help
-
-Example:
-\$ sudo -u www-data /usr/bin/php admin/cli/mysql_compressed_rows.php -l
-";
-
-/** @var mysql_sql_generator $generator */
-$generator = $DB->get_manager()->generator;
-
-$info = $DB->get_server_info();
-$filepertable = $DB->get_record_sql("SHOW VARIABLES LIKE 'innodb_file_per_table'");
-$filepertable = $filepertable ? $filepertable->value : '';
-$fileformat = $DB->get_record_sql("SHOW VARIABLES LIKE 'innodb_file_format'");
-$fileformat = $fileformat ? $fileformat->value : '';
-$prefix = $DB->get_prefix();
-$database = $CFG->dbname;
-
-if (!empty($options['info'])) {
-    echo "Database version:      " . $info['description'] . "\n";
-    echo "Database name:         $database\n";
-    echo "Database engine:       " . $DB->get_dbengine() . "\n";
-    echo "innodb_file_per_table: $filepertable\n";
-    echo "innodb_file_format:    $fileformat\n";
-
-    exit(0);
-
-} else if (!empty($options['list'])) {
-    $problem = false;
-    foreach ($DB->get_tables(false) as $table) {
-        $columns = $DB->get_columns($table, false);
-        $size = $generator->guess_antolope_row_size($columns);
-        $format = $DB->get_row_format($table);
-        if ($size <= $generator::ANTELOPE_MAX_ROW_SIZE) {
-            continue;
-        }
-
-        echo str_pad($prefix . $table, 32, ' ', STR_PAD_RIGHT);
-        echo str_pad($format, 11, ' ', STR_PAD_RIGHT);
-
-        if ($format === 'Compact' or $format === 'Redundant') {
-            $problem = true;
-            echo " (needs fixing)\n";
-
-        } else if ($format !== 'Compressed' and $format !== 'Dynamic') {
-            echo " (unknown)\n";
-
-        } else {
-            echo "\n";
-        }
-    }
-
-    if ($problem) {
-        exit(1);
-    }
-    exit(0);
-
-} else if (!empty($options['fix'])) {
-    $fixtables = array();
-    foreach ($DB->get_tables(false) as $table) {
-        $columns = $DB->get_columns($table, false);
-        $size = $generator->guess_antolope_row_size($columns);
-        $format = $DB->get_row_format($table);
-        if ($size <= $generator::ANTELOPE_MAX_ROW_SIZE) {
-            continue;
-        }
-        if ($format === 'Compact' or $format === 'Redundant') {
-            $fixtables[$table] = $table;
-        }
-    }
-
-    if (!$fixtables) {
-        echo "No changes necessary\n";
-        exit(0);
-    }
-
-    if ($filepertable !== 'ON') {
-        try {
-            $DB->execute("SET GLOBAL innodb_file_per_table=1");
-        } catch (dml_exception $e) {
-            echo "Cannot enable GLOBAL innodb_file_per_table setting, use --showsql option and execute the statements manually.";
-            throw $e;
-        }
-    }
-    if ($fileformat !== 'Barracuda') {
-        try {
-            $DB->execute("SET GLOBAL innodb_file_format=Barracuda");
-        } catch (dml_exception $e) {
-            echo "Cannot change GLOBAL innodb_file_format setting, use --showsql option and execute the statements manually.";
-            throw $e;
-        }
-    }
-
-    if (!$DB->is_compressed_row_format_supported(false)) {
-        echo "MySQL server is not compatible with compressed row format.";
-        exit(1);
-    }
-
-    foreach ($fixtables as $table) {
-        $DB->change_database_structure("ALTER TABLE {$prefix}$table ROW_FORMAT=Compressed");
-        echo str_pad($prefix . $table, 32, ' ', STR_PAD_RIGHT) . " ... Compressed\n";
-    }
-
-    exit(0);
-
-} else if (!empty($options['showsql'])) {
-    $fixtables = array();
-
-    foreach ($DB->get_tables(false) as $table) {
-        $columns = $DB->get_columns($table, false);
-        $size = $generator->guess_antolope_row_size($columns);
-        $format = $DB->get_row_format($table);
-        if ($size <= $generator::ANTELOPE_MAX_ROW_SIZE) {
-            continue;
-        }
-        if ($format === 'Compact' or $format === 'Redundant') {
-            $fixtables[$table] = $table;
-        }
-    }
-    if (!$fixtables) {
-        echo "No changes necessary\n";
-        exit(0);
-    }
-
-    echo "Copy the following SQL statements and execute them using account with SUPER privilege:\n\n";
-    echo "USE $database;\n";
-    echo "SET SESSION sql_mode=STRICT_ALL_TABLES;\n";
-    echo "SET GLOBAL innodb_file_per_table=1;\n";
-    echo "SET GLOBAL innodb_file_format=Barracuda;\n";
-    foreach ($fixtables as $table) {
-        echo "ALTER TABLE {$prefix}$table ROW_FORMAT=Compressed;\n";
-    }
-    echo "\n";
-    exit(0);
-
-} else {
-    echo $help;
-    die;
-}
-
-

admin/environment.php

@@ -45,7 +45,7 @@ admin_externalpage_setup('environment', '', $extraurlparams);
 // Handle the 'updatecomponent' action
 if ($action == 'updatecomponent' && confirm_sesskey()) {
     // Create component installer and execute it
-    if ($cd = new component_installer('https://download.moodle.org',
+    if ($cd = new component_installer('http://download.moodle.org',
                                       'environment',
                                       'environment.zip')) {
         $status = $cd->install(); //returns COMPONENT_(ERROR | UPTODATE | INSTALLED)
@@ -53,7 +53,7 @@ if ($action == 'updatecomponent' && confirm_sesskey()) {
             case COMPONENT_ERROR:
                 if ($cd->get_error() == 'remotedownloaderror') {
                     $a = new stdClass();
-                    $a->url  = 'https://download.moodle.org/environment/environment.zip';
+                    $a->url  = 'http://download.moodle.org/environment/environment.zip';
                     $a->dest = $CFG->dataroot . '/';
                     print_error($cd->get_error(), 'error', $PAGE->url, $a);
                     die();
@@ -102,7 +102,7 @@ if ($contents = load_environment_xml()) {
 }
 
 // Get the results of the environment check.
-list($envstatus, $environment_results) = check_moodle_environment($version, ENV_SELECT_NEWER);
+list($envstatus, $environment_results) = check_moodle_environment($version);
 
 // Display the page.
 $output = $PAGE->get_renderer('core', 'admin');

admin/environment.xml

@@ -1027,7 +1027,6 @@
       <VENDOR name="oracle" version="10.2" />
     </DATABASE>
     <PHP version="5.4.4" level="required">
-      <RESTRICT function="restrict_php_version_7" message="unsupportedphpversion7" />
     </PHP>
     <PCREUNICODE level="optional">
       <FEEDBACK>
@@ -1135,565 +1134,6 @@
           <ON_ERROR message="quizattemptsupgradedmessage" />
         </FEEDBACK>
       </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="slashargumentswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="unsupporteddbtablerowformat" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-    </CUSTOM_CHECKS>
-  </MOODLE>
-  <MOODLE version="2.8" requires="2.2">
-    <UNICODE level="required">
-      <FEEDBACK>
-        <ON_ERROR message="unicoderequired" />
-      </FEEDBACK>
-    </UNICODE>
-    <DATABASE level="required">
-      <VENDOR name="mariadb" version="5.5.31" />
-      <VENDOR name="mysql" version="5.5.31" />
-      <VENDOR name="postgres" version="9.1" />
-      <VENDOR name="mssql" version="10.0" />
-      <VENDOR name="oracle" version="10.2" />
-    </DATABASE>
-    <PHP version="5.4.4" level="required">
-      <RESTRICT function="restrict_php_version_7" message="unsupportedphpversion7" />
-    </PHP>
-    <PCREUNICODE level="optional">
-      <FEEDBACK>
-        <ON_CHECK message="pcreunicodewarning" />
-      </FEEDBACK>
-    </PCREUNICODE>
-    <PHP_EXTENSIONS>
-      <PHP_EXTENSION name="iconv" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="iconvrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="mbstring" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="mbstringrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="curl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="curlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="openssl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="opensslrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="tokenizer" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="tokenizerrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlrpc" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="xmlrpcrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="soap" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="soaprecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="ctype" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ctyperequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zip" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ziprequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zlib" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="gd" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="gdrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="simplexml" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="simplexmlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="spl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="splrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="pcre" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="dom" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xml" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="intl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="intlrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="json" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="hash" level="required"/>
-    </PHP_EXTENSIONS>
-    <PHP_SETTINGS>
-      <PHP_SETTING name="memory_limit" value="96M" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="settingmemorylimit" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="file_uploads" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="settingfileuploads" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="opcache.enable" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="opcacherecommended" />
-        </FEEDBACK>
-      </PHP_SETTING>
-    </PHP_SETTINGS>
-    <CUSTOM_CHECKS>
-      <CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="quizattemptsupgradedmessage" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="slashargumentswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="unsupporteddbtablerowformat" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-    </CUSTOM_CHECKS>
-  </MOODLE>
-  <MOODLE version="2.9" requires="2.2">
-    <UNICODE level="required">
-      <FEEDBACK>
-        <ON_ERROR message="unicoderequired" />
-      </FEEDBACK>
-    </UNICODE>
-    <DATABASE level="required">
-      <VENDOR name="mariadb" version="5.5.31" />
-      <VENDOR name="mysql" version="5.5.31" />
-      <VENDOR name="postgres" version="9.1" />
-      <VENDOR name="mssql" version="10.0" />
-      <VENDOR name="oracle" version="10.2" />
-    </DATABASE>
-    <PHP version="5.4.4" level="required">
-      <RESTRICT function="restrict_php_version_7" message="unsupportedphpversion7" />
-    </PHP>
-    <PCREUNICODE level="optional">
-      <FEEDBACK>
-        <ON_CHECK message="pcreunicodewarning" />
-      </FEEDBACK>
-    </PCREUNICODE>
-    <PHP_EXTENSIONS>
-      <PHP_EXTENSION name="iconv" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="iconvrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="mbstring" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="mbstringrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="curl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="curlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="openssl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="opensslrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="tokenizer" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="tokenizerrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlrpc" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="xmlrpcrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="soap" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="soaprecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="ctype" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ctyperequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zip" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ziprequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zlib" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="gd" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="gdrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="simplexml" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="simplexmlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="spl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="splrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="pcre" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="dom" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xml" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="intl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="intlrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="json" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="hash" level="required"/>
-    </PHP_EXTENSIONS>
-    <PHP_SETTINGS>
-      <PHP_SETTING name="memory_limit" value="96M" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="settingmemorylimit" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="file_uploads" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="settingfileuploads" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="opcache.enable" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="opcacherecommended" />
-        </FEEDBACK>
-      </PHP_SETTING>
-    </PHP_SETTINGS>
-    <CUSTOM_CHECKS>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbstorageengine" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="quizattemptsupgradedmessage" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="slashargumentswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="unsupporteddbtablerowformat" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-    </CUSTOM_CHECKS>
-  </MOODLE>
-  <MOODLE version="3.0" requires="2.2">
-    <UNICODE level="required">
-      <FEEDBACK>
-        <ON_ERROR message="unicoderequired" />
-      </FEEDBACK>
-    </UNICODE>
-    <DATABASE level="required">
-      <VENDOR name="mariadb" version="5.5.31" />
-      <VENDOR name="mysql" version="5.5.31" />
-      <VENDOR name="postgres" version="9.1" />
-      <VENDOR name="mssql" version="10.0" />
-      <VENDOR name="oracle" version="10.2" />
-    </DATABASE>
-    <PHP version="5.4.4" level="required">
-    </PHP>
-    <PCREUNICODE level="optional">
-      <FEEDBACK>
-        <ON_CHECK message="pcreunicodewarning" />
-      </FEEDBACK>
-    </PCREUNICODE>
-    <PHP_EXTENSIONS>
-      <PHP_EXTENSION name="iconv" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="iconvrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="mbstring" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="mbstringrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="curl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="curlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="openssl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="opensslrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="tokenizer" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="tokenizerrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlrpc" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="xmlrpcrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="soap" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="soaprecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="ctype" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ctyperequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zip" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ziprequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zlib" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="gd" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="gdrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="simplexml" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="simplexmlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="spl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="splrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="pcre" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="dom" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xml" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="intl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="intlrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="json" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="hash" level="required"/>
-    </PHP_EXTENSIONS>
-    <PHP_SETTINGS>
-      <PHP_SETTING name="memory_limit" value="96M" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="settingmemorylimit" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="file_uploads" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="settingfileuploads" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="opcache.enable" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="opcacherecommended" />
-        </FEEDBACK>
-      </PHP_SETTING>
-    </PHP_SETTINGS>
-    <CUSTOM_CHECKS>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbstorageengine" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="quizattemptsupgradedmessage" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="slashargumentswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="unsupporteddbtablerowformat" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-    </CUSTOM_CHECKS>
-  </MOODLE>
-  <MOODLE version="3.1" requires="2.7">
-    <UNICODE level="required">
-      <FEEDBACK>
-        <ON_ERROR message="unicoderequired" />
-      </FEEDBACK>
-    </UNICODE>
-    <DATABASE level="required">
-      <VENDOR name="mariadb" version="5.5.31" />
-      <VENDOR name="mysql" version="5.5.31" />
-      <VENDOR name="postgres" version="9.1" />
-      <VENDOR name="mssql" version="10.0" />
-      <VENDOR name="oracle" version="10.2" />
-    </DATABASE>
-    <PHP version="5.4.4" level="required">
-    </PHP>
-    <PCREUNICODE level="optional">
-      <FEEDBACK>
-        <ON_CHECK message="pcreunicodewarning" />
-      </FEEDBACK>
-    </PCREUNICODE>
-    <PHP_EXTENSIONS>
-      <PHP_EXTENSION name="iconv" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="iconvrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="mbstring" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="mbstringrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="curl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="curlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="openssl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="opensslrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="tokenizer" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="tokenizerrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlrpc" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="xmlrpcrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="soap" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="soaprecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="ctype" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ctyperequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zip" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ziprequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zlib" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="gd" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="gdrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="simplexml" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="simplexmlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="spl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="splrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="pcre" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="dom" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xml" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="intl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="intlrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="json" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="hash" level="required"/>
-    </PHP_EXTENSIONS>
-    <PHP_SETTINGS>
-      <PHP_SETTING name="memory_limit" value="96M" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="settingmemorylimit" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="file_uploads" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="settingfileuploads" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="opcache.enable" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="opcacherecommended" />
-        </FEEDBACK>
-      </PHP_SETTING>
-    </PHP_SETTINGS>
-    <CUSTOM_CHECKS>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbstorageengine" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="quizattemptsupgradedmessage" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="slashargumentswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="unsupporteddbtablerowformat" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
     </CUSTOM_CHECKS>
   </MOODLE>
 </COMPATIBILITY_MATRIX>

admin/index.php

@@ -514,15 +514,7 @@ if (isguestuser()) {
     redirect(get_login_url());
 }
 $context = context_system::instance();
-
-if (!has_capability('moodle/site:config', $context)) {
-    // Do not throw exception display an empty page with administration menu if visible for current user.
-    $PAGE->set_title($SITE->fullname);
-    $PAGE->set_heading($SITE->fullname);
-    echo $OUTPUT->header();
-    echo $OUTPUT->footer();
-    exit;
-}
+require_capability('moodle/site:config', $context);
 
 // check that site is properly customized
 $site = get_site();
@@ -563,54 +555,44 @@ if (isset($SESSION->pluginuninstallreturn)) {
 // Print default admin page with notifications.
 $errorsdisplayed = defined('WARN_DISPLAY_ERRORS_ENABLED');
 
-// We make the assumption that at least one schedule task should run once per day.
-$lastcron = $DB->get_field_sql('SELECT MAX(lastruntime) FROM {task_scheduled}');
+$lastcron = $DB->get_field_sql('SELECT MAX(lastcron) FROM {modules}');
 $cronoverdue = ($lastcron < time() - 3600 * 24);
 $dbproblems = $DB->diagnose();
 $maintenancemode = !empty($CFG->maintenance_enabled);
 
-// Available updates for Moodle core.
+// Available updates for Moodle core
 $updateschecker = \core\update\checker::instance();
 $availableupdates = array();
-$availableupdatesfetch = null;
+$availableupdates['core'] = $updateschecker->get_update_info('core',
+    array('minmaturity' => $CFG->updateminmaturity, 'notifybuilds' => $CFG->updatenotifybuilds));
 
-if (empty($CFG->disableupdatenotifications)) {
-    // Only compute the update information when it is going to be displayed to the user.
-    $availableupdates['core'] = $updateschecker->get_update_info('core',
-        array('minmaturity' => $CFG->updateminmaturity, 'notifybuilds' => $CFG->updatenotifybuilds));
-
-    // Available updates for contributed plugins
-    $pluginman = core_plugin_manager::instance();
-    foreach ($pluginman->get_plugins() as $plugintype => $plugintypeinstances) {
-        foreach ($plugintypeinstances as $pluginname => $plugininfo) {
-            if (!empty($plugininfo->availableupdates)) {
-                foreach ($plugininfo->availableupdates as $pluginavailableupdate) {
-                    if ($pluginavailableupdate->version > $plugininfo->versiondisk) {
-                        if (!isset($availableupdates[$plugintype.'_'.$pluginname])) {
-                            $availableupdates[$plugintype.'_'.$pluginname] = array();
-                        }
-                        $availableupdates[$plugintype.'_'.$pluginname][] = $pluginavailableupdate;
+// Available updates for contributed plugins
+$pluginman = core_plugin_manager::instance();
+foreach ($pluginman->get_plugins() as $plugintype => $plugintypeinstances) {
+    foreach ($plugintypeinstances as $pluginname => $plugininfo) {
+        if (!empty($plugininfo->availableupdates)) {
+            foreach ($plugininfo->availableupdates as $pluginavailableupdate) {
+                if ($pluginavailableupdate->version > $plugininfo->versiondisk) {
+                    if (!isset($availableupdates[$plugintype.'_'.$pluginname])) {
+                        $availableupdates[$plugintype.'_'.$pluginname] = array();
                     }
+                    $availableupdates[$plugintype.'_'.$pluginname][] = $pluginavailableupdate;
                 }
             }
         }
     }
-
-    // The timestamp of the most recent check for available updates
-    $availableupdatesfetch = $updateschecker->get_last_timefetched();
 }
 
+// The timestamp of the most recent check for available updates
+$availableupdatesfetch = $updateschecker->get_last_timefetched();
+
 $buggyiconvnomb = (!function_exists('mb_convert_encoding') and @iconv('UTF-8', 'UTF-8//IGNORE', '100'.chr(130).'€') !== '100€');
 //check if the site is registered on Moodle.org
 $registered = $DB->count_records('registration_hubs', array('huburl' => HUB_MOODLEORGHUBURL, 'confirmed' => 1));
-// Check if there are any cache warnings.
-$cachewarnings = cache_helper::warnings();
 
 admin_externalpage_setup('adminnotifications');
 
-/* @var core_admin_renderer $output */
 $output = $PAGE->get_renderer('core', 'admin');
-
-echo $output->admin_notifications_page($maturity, $insecuredataroot, $errorsdisplayed, $cronoverdue, $dbproblems,
-                                       $maintenancemode, $availableupdates, $availableupdatesfetch, $buggyiconvnomb,
-                                       $registered, $cachewarnings);
+echo $output->admin_notifications_page($maturity, $insecuredataroot, $errorsdisplayed,
+        $cronoverdue, $dbproblems, $maintenancemode, $availableupdates, $availableupdatesfetch, $buggyiconvnomb,
+        $registered);

admin/mnet/index.php

@@ -1,4 +1,4 @@
-<?php
+<?PHP
 
     // Allows the admin to configure mnet stuff
 

admin/mnet/tabs.php

@@ -34,12 +34,21 @@ if (!defined('MOODLE_INTERNAL')) {
 }
 
 $strmnetservices   = get_string('mnetservices', 'mnet');
+$strmnetlog        = get_string('mnetlog', 'mnet');
 $strmnetedithost   = get_string('reviewhostdetails', 'mnet');
 
+$logurl = $CFG->wwwroot.
+          '/report/log/index.php?chooselog=1&showusers=1&showcourses=1&host_course='.$mnet_peer->id.
+          '%2F1&user='.'0'.
+          '&date=0'.
+          '&modid=&modaction=0&logformat=showashtml';
 $tabs = array();
 if (isset($mnet_peer->id) && $mnet_peer->id > 0) {
     $tabs[] = new tabobject('mnetdetails', 'peers.php?step=update&hostid='.$mnet_peer->id, $strmnetedithost, $strmnetedithost, false);
     $tabs[] = new tabobject('mnetservices', 'services.php?hostid='.$mnet_peer->id, $strmnetservices, $strmnetservices, false);
+    if ($mnet_peer->application->name == 'moodle' && $mnet_peer->id != $CFG->mnet_all_hosts_id) {
+        $tabs[] = new tabobject('mnetlog', $logurl, $strmnetlog, $strmnetlog, false);
+    }
     $tabs[] = new tabobject('mnetprofilefields', 'profilefields.php?hostid=' . $mnet_peer->id, get_string('profilefields', 'mnet'), get_string('profilefields', 'mnet'), false);
 } else {
     $tabs[] = new tabobject('mnetdetails', '#', $strmnetedithost, $strmnetedithost, false);

admin/phpinfo.php

@@ -11,7 +11,7 @@
     echo '<div class="phpinfo">';
 
     ob_start();
-    phpinfo(INFO_GENERAL + INFO_CONFIGURATION + INFO_MODULES + INFO_VARIABLES);
+    phpinfo(INFO_GENERAL + INFO_CONFIGURATION + INFO_MODULES);
     $html = ob_get_contents();
     ob_end_clean();
 

admin/registration/confirmregistration.php

@@ -65,7 +65,7 @@ if (!empty($registeredhub) and $registeredhub->token == $token) {
     $registeredhub->hubname = $hubname;
     $registrationmanager->update_registeredhub($registeredhub);
 
-    // Display notification message.
+    //display notficiation message
     $notificationmessage = $OUTPUT->notification(
             get_string('registrationconfirmedon', 'hub', $hublink), 'notifysuccess');
     echo $notificationmessage;

admin/registration/index.php

@@ -22,9 +22,9 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL
  * @copyright  (C) 1999 onwards Martin Dougiamas  http://dougiamas.com
  *
- * On this page the administrator selects which hub he wants to register (except for moodle.net)
- * Admins can register with moodle.net via the site admin menu "Registration" link.
- * On this page the administrator can also unregister from any hubs including moodle.net.
+ * On this page the administrator selects which hub he wants to register,
+ * except for MOOCH. Admins can register with MOOCH with the top admin menu "Registration" link.
+ * On this page the administrator can also unregister from any hubs, including MOOCH.
  */
 
 require('../../config.php');

admin/registration/lib.php

@@ -53,30 +53,31 @@ class registration_manager {
     public function cron() {
         global $CFG;
         if (extension_loaded('xmlrpc')) {
-            $function = 'hub_update_site_info';
-            require_once($CFG->dirroot . "/webservice/xmlrpc/lib.php");
+            //check if the last registration cron update was less than a week ago
+            $lastcron = get_config('registration', 'crontime');
+            if ($lastcron === false or $lastcron < strtotime("-7 day")) { //set to a week, see MDL-23704
+                $function = 'hub_update_site_info';
+                require_once($CFG->dirroot . "/webservice/xmlrpc/lib.php");
 
-            // Update all hubs where the site is registered.
-            $hubs = $this->get_registered_on_hubs();
-            if (empty($hubs)) {
-                mtrace(get_string('registrationwarning', 'admin'));
-            }
-            foreach ($hubs as $hub) {
-                // Update the registration.
-                $siteinfo = $this->get_site_info($hub->huburl);
-                $params = array('siteinfo' => $siteinfo);
-                $serverurl = $hub->huburl . "/local/hub/webservice/webservices.php";
-                $xmlrpcclient = new webservice_xmlrpc_client($serverurl, $hub->token);
-                try {
-                    $result = $xmlrpcclient->call($function, $params);
-                    $this->update_registeredhub($hub); // To update timemodified.
-                    mtrace(get_string('siteupdatedcron', 'hub', $hub->hubname));
-                } catch (Exception $e) {
-                    $errorparam = new stdClass();
-                    $errorparam->errormessage = $e->getMessage();
-                    $errorparam->hubname = $hub->hubname;
-                    mtrace(get_string('errorcron', 'hub', $errorparam));
+                //update all hub where the site is registered on
+                $hubs = $this->get_registered_on_hubs();
+                foreach ($hubs as $hub) {
+                    //update the registration
+                    $siteinfo = $this->get_site_info($hub->huburl);
+                    $params = array('siteinfo' => $siteinfo);
+                    $serverurl = $hub->huburl . "/local/hub/webservice/webservices.php";
+                    $xmlrpcclient = new webservice_xmlrpc_client($serverurl, $hub->token);
+                    try {
+                        $result = $xmlrpcclient->call($function, $params);
+                        mtrace(get_string('siteupdatedcron', 'hub', $hub->hubname));
+                    } catch (Exception $e) {
+                        $errorparam = new stdClass();
+                        $errorparam->errormessage = $e->getMessage();
+                        $errorparam->hubname = $hub->hubname;
+                        mtrace(get_string('errorcron', 'hub', $errorparam));
+                    }
                 }
+                set_config('crontime', time(), 'registration');
             }
         } else {
             mtrace(get_string('errorcronnoxmlrpc', 'hub'));

admin/registration/register.php

@@ -39,8 +39,6 @@ require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/forms.php');
 require_once($CFG->dirroot . '/webservice/lib.php');
 require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');
 
-require_sesskey();
-
 $huburl = required_param('huburl', PARAM_URL);
 $huburl = rtrim($huburl, "/");
 
@@ -179,13 +177,6 @@ if (!empty($error)) {
 
 //some Moodle.org resitration explanation
 if ($huburl == HUB_MOODLEORGHUBURL) {
-    if (!empty($registeredhub->token)) {
-        $registrationmessage = get_string('pleaserefreshregistration', 'admin');
-    } else {
-        $registrationmessage = get_string('registrationwarning', 'admin');
-    }
-    echo $OUTPUT->notification($registrationmessage);
-
     echo $OUTPUT->heading(get_string('registerwithmoodleorg', 'admin'));
     $renderer = $PAGE->get_renderer('core', 'register');
     echo $renderer->moodleorg_registration_message();

admin/registration/renderer.php

@@ -36,18 +36,13 @@ class core_register_renderer extends plugin_renderer_base {
      * @return string
      */
     public function moodleorg_registration_message() {
-
-        $moodleorgstatslink = html_writer::link('http://moodle.net/stats',
-                                               get_string('statsmoodleorg', 'admin'),
-                                               array('target' => '_blank'));
-
-        $hublink = html_writer::link('https://moodle.net/mod/page/view.php?id=1',
-                                      get_string('moodleorghubname', 'admin'),
-                                      array('target' => '_blank'));
-
-        $moodleorgregmsg = get_string('registermoodleorg', 'admin', $hublink);
+        $moodleorgurl = html_writer::link('http://moodle.org', 'Moodle.org');
+        $moodleorgstatsurl = html_writer::link('http://moodle.org/stats', get_string('statsmoodleorg', 'admin'));
+        $moochurl = html_writer::link(HUB_MOODLEORGHUBURL, get_string('moodleorghubname', 'admin'));
+        $moodleorgregmsg = get_string('registermoodleorg', 'admin', $moodleorgurl);
         $items = array(get_string('registermoodleorgli1', 'admin'),
-                       get_string('registermoodleorgli2', 'admin', $moodleorgstatslink));
+            get_string('registermoodleorgli2', 'admin', $moodleorgstatsurl),
+            get_string('registermoodleorgli3', 'admin', $moochurl));
         $moodleorgregmsg .= html_writer::alist($items);
         return $moodleorgregmsg;
     }

admin/renderer.php

@@ -303,13 +303,12 @@ class core_admin_renderer extends plugin_renderer_base {
      * @param bool $buggyiconvnomb warn iconv problems
      * @param array|null $availableupdates array of \core\update\info objects or null
      * @param int|null $availableupdatesfetch timestamp of the most recent updates fetch or null (unknown)
-     * @param string[] $cachewarnings An array containing warnings from the Cache API.
      *
      * @return string HTML to output.
      */
     public function admin_notifications_page($maturity, $insecuredataroot, $errorsdisplayed,
             $cronoverdue, $dbproblems, $maintenancemode, $availableupdates, $availableupdatesfetch,
-            $buggyiconvnomb, $registered, array $cachewarnings = array()) {
+            $buggyiconvnomb, $registered) {
         global $CFG;
         $output = '';
 
@@ -322,7 +321,6 @@ class core_admin_renderer extends plugin_renderer_base {
         $output .= $this->cron_overdue_warning($cronoverdue);
         $output .= $this->db_problems($dbproblems);
         $output .= $this->maintenance_mode_warning($maintenancemode);
-        $output .= $this->cache_warnings($cachewarnings);
         $output .= $this->registration_warning($registered);
 
         //////////////////////////////////////////////////////////////////////////////////////////////////
@@ -597,19 +595,6 @@ class core_admin_renderer extends plugin_renderer_base {
         return $this->warning($dbproblems);
     }
 
-    /**
-     * Renders cache warnings if there are any.
-     *
-     * @param string[] $cachewarnings
-     * @return string
-     */
-    public function cache_warnings(array $cachewarnings) {
-        if (!count($cachewarnings)) {
-            return '';
-        }
-        return join("\n", array_map(array($this, 'warning'), $cachewarnings));
-    }
-
     /**
      * Render an appropriate message if the site in in maintenance mode.
      * @param bool $maintenancemode
@@ -1039,28 +1024,19 @@ class core_admin_renderer extends plugin_renderer_base {
         }
 
         foreach ($plugin->get_other_required_plugins() as $component => $requiredversion) {
+            $ok = true;
             $otherplugin = $pluginman->get_plugin_info($component);
-            $actions = array();
 
             if (is_null($otherplugin)) {
-                // The required plugin is not installed.
-                $class = 'requires-failed requires-missing';
-                $installurl = new moodle_url('https://moodle.org/plugins/view.php', array('plugin' => $component));
-                $uploadurl = new moodle_url('/admin/tool/installaddon/');
-                $actions[] = html_writer::link($installurl, get_string('dependencyinstall', 'core_plugin'));
-                $actions[] = html_writer::link($uploadurl, get_string('dependencyupload', 'core_plugin'));
-
+                $ok = false;
             } else if ($requiredversion != ANY_VERSION and $otherplugin->versiondisk < $requiredversion) {
-                // The required plugin is installed but needs to be updated.
-                $class = 'requires-failed requires-outdated';
-                if (!$otherplugin->is_standard()) {
-                    $updateurl = new moodle_url($this->page->url, array('sesskey' => sesskey(), 'fetchupdates' => 1));
-                    $actions[] = html_writer::link($updateurl, get_string('checkforupdates', 'core_plugin'));
-                }
+                $ok = false;
+            }
 
-            } else {
-                // Already installed plugin with sufficient version.
+            if ($ok) {
                 $class = 'requires-ok';
+            } else {
+                $class = 'requires-failed';
             }
 
             if ($requiredversion != ANY_VERSION) {
@@ -1068,11 +1044,11 @@ class core_admin_renderer extends plugin_renderer_base {
             } else {
                 $str = 'otherplugin';
             }
-
+            $componenturl = new moodle_url('https://moodle.org/plugins/view.php?plugin='.$component);
+            $componenturl = html_writer::tag('a', $component, array('href' => $componenturl->out()));
             $requires[] = html_writer::tag('li',
-                    html_writer::div(get_string($str, 'core_plugin',
-                            array('component' => $component, 'version' => $requiredversion)), 'component').
-                    html_writer::div(implode(' | ', $actions), 'actions'),
+                    get_string($str, 'core_plugin',
+                            array('component' => $componenturl, 'version' => $requiredversion)),
                     array('class' => $class));
         }
 
@@ -1394,7 +1370,7 @@ class core_admin_renderer extends plugin_renderer_base {
      * configuration and how it suits Moodle needs.
      *
      * @param boolean $result final result of the check (true/false)
-     * @param environment_results[] $environment_results array of results gathered
+     * @param array $environment_results array of results gathered
      * @return string HTML to output.
      */
     public function environment_check_table($result, $environment_results) {
@@ -1406,10 +1382,9 @@ class core_admin_renderer extends plugin_renderer_base {
             get_string('name'),
             get_string('info'),
             get_string('report'),
-            get_string('plugin'),
             get_string('status'),
         );
-        $servertable->colclasses = array('centeralign name', 'centeralign info', 'leftalign report', 'leftalign plugin', 'centeralign status');
+        $servertable->colclasses = array('centeralign name', 'centeralign info', 'leftalign report', 'centeralign status');
         $servertable->attributes['class'] = 'admintable environmenttable generaltable';
         $servertable->id = 'serverstatus';
 
@@ -1419,10 +1394,9 @@ class core_admin_renderer extends plugin_renderer_base {
         $othertable->head  = array(
             get_string('info'),
             get_string('report'),
-            get_string('plugin'),
             get_string('status'),
         );
-        $othertable->colclasses = array('aligncenter info', 'alignleft report', 'alignleft plugin', 'aligncenter status');
+        $othertable->colclasses = array('aligncenter info', 'alignleft report', 'aligncenter status');
         $othertable->attributes['class'] = 'admintable environmenttable generaltable';
         $othertable->id = 'otherserverstatus';
 
@@ -1438,7 +1412,6 @@ class core_admin_renderer extends plugin_renderer_base {
                 $type = $environment_result->getPart();
                 $info = $environment_result->getInfo();
                 $status = $environment_result->getStatus();
-                $plugin = $environment_result->getPluginName();
                 $error_code = $environment_result->getErrorCode();
                 // Process Report field
                 $rec = new stdClass();
@@ -1515,8 +1488,7 @@ class core_admin_renderer extends plugin_renderer_base {
                 if (!empty($info)){
                    $linkparts[] = $info;
                 }
-                // Plugin environments do not have docs pages yet.
-                if (empty($CFG->docroot) or $environment_result->plugin) {
+                if (empty($CFG->docroot)) {
                     $report = get_string($stringtouse, 'admin', $rec);
                 } else {
                     $report = $this->doc_link(join($linkparts, '/'), get_string($stringtouse, 'admin', $rec));
@@ -1542,9 +1514,9 @@ class core_admin_renderer extends plugin_renderer_base {
 
                 // Add the row to the table
                 if ($environment_result->getPart() == 'custom_check'){
-                    $otherdata[$messagetype][] = array ($info, $report, $plugin, $status);
+                    $otherdata[$messagetype][] = array ($info, $report, $status);
                 } else {
-                    $serverdata[$messagetype][] = array ($type, $info, $report, $plugin, $status);
+                    $serverdata[$messagetype][] = array ($type, $info, $report, $status);
                 }
             }
         }

admin/reports.php

@@ -50,8 +50,7 @@ $table->set_attribute('class', 'admintable generaltable');
 $table->setup();
 
 $plugins = array();
-$availableplugins = core_component::get_plugin_list('report');
-foreach ($availableplugins as $plugin => $plugindir) {
+foreach (core_component::get_plugin_list('report') as $plugin => $plugindir) {
     if (get_string_manager()->string_exists('pluginname', 'report_' . $plugin)) {
         $strpluginname = get_string('pluginname', 'report_' . $plugin);
     } else {
@@ -81,10 +80,7 @@ foreach ($plugins as $plugin => $name) {
         $uninstall = html_writer::link($uninstallurl, $struninstall);
     }
 
-    $stores = array();
-    if (isset($availableplugins[$plugin])) {
-        $stores = $logmanager->get_supported_logstores('report_' . $plugin);
-    }
+    $stores = $logmanager->get_supported_logstores('report_' . $plugin);
     if ($stores === false) {
         $supportedstores = get_string('logstorenotrequired', 'admin');
     } else if (!empty($stores)) {

admin/repository.php

@@ -264,7 +264,6 @@ if (($action == 'edit') || ($action == 'new')) {
     $strshow = get_string('on', 'repository');
     $strhide = get_string('off', 'repository');
     $strdelete = get_string('disabled', 'repository');
-    $struninstall = get_string('uninstallplugin', 'core_admin');
 
     $actionchoicesforexisting = array(
         'show' => $strshow,
@@ -287,9 +286,9 @@ if (($action == 'edit') || ($action == 'new')) {
 
     // Table to list plug-ins
     $table = new html_table();
-    $table->head = array(get_string('name'), get_string('isactive', 'repository'), get_string('order'), $settingsstr, $struninstall);
+    $table->head = array(get_string('name'), get_string('isactive', 'repository'), get_string('order'), $settingsstr);
 
-    $table->colclasses = array('leftalign', 'centeralign', 'centeralign', 'centeralign', 'centeralign', 'centeralign');
+    $table->colclasses = array('leftalign', 'centeralign', 'centeralign', 'centeralign', 'centeralign');
     $table->id = 'repositoriessetting';
     $table->data = array();
     $table->attributes['class'] = 'admintable generaltable';
@@ -385,12 +384,7 @@ if (($action == 'edit') || ($action == 'new')) {
 
             $updowncount++;
 
-            $uninstall = '';
-            if ($uninstallurl = core_plugin_manager::instance()->get_uninstall_url('repository_' . $typename, 'manage')) {
-                $uninstall = html_writer::link($uninstallurl, $struninstall);
-            }
-
-            $table->data[] = array($i->get_readablename(), $OUTPUT->render($select), $updown, $settings, $uninstall);
+            $table->data[] = array($i->get_readablename(), $OUTPUT->render($select), $updown, $settings);
 
             if (!in_array($typename, $alreadyplugins)) {
                 $alreadyplugins[] = $typename;
@@ -406,11 +400,7 @@ if (($action == 'edit') || ($action == 'new')) {
             if (!in_array($plugin, $alreadyplugins)) {
                 $select = new single_select(repository_action_url($plugin, 'repos'), 'action', $actionchoicesfornew, 'delete', null, 'applyto' . basename($plugin));
                 $select->set_label(get_string('action'), array('class' => 'accesshide'));
-                $uninstall = '';
-                if ($uninstallurl = core_plugin_manager::instance()->get_uninstall_url('repository_' . $plugin, 'manage')) {
-                    $uninstall = html_writer::link($uninstallurl, $struninstall);
-                }
-                $table->data[] = array(get_string('pluginname', 'repository_'.$plugin), $OUTPUT->render($select), '', '', $uninstall);
+                $table->data[] = array(get_string('pluginname', 'repository_'.$plugin), $OUTPUT->render($select), '', '');
             }
         }
     }

admin/roles/classes/define_role_table_advanced.php

@@ -472,9 +472,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
     }
 
     protected function get_description_field($id) {
-        return '<textarea class="form-textarea" id="'. s($id) .'" name="description" rows="10" cols="50">' .
-            htmlspecialchars($this->role->description) .
-            '</textarea>';
+        return print_textarea(true, 10, 50, 50, 10, 'description', $this->role->description, 0, true);
     }
 
     protected function get_archetype_field($id) {

admin/roles/classes/existing_role_holders.php

@@ -41,24 +41,15 @@ class core_role_existing_role_holders extends core_role_assign_user_selector_bas
         list($sort, $sortparams) = users_order_by_sql('u', $search, $this->accesscontext);
         $params = array_merge($params, $sortparams);
 
-        $fields = "SELECT ra.id AS raid," . $this->required_fields_sql('u') . ",ra.contextid,ra.component ";
-        $countfields = "SELECT COUNT(1) ";
-        $sql = "FROM {role_assignments} ra
+        $sql = "SELECT ra.id AS raid," . $this->required_fields_sql('u') . ",ra.contextid,ra.component
+                  FROM {role_assignments} ra
                   JOIN {user} u ON u.id = ra.userid
                   JOIN {context} ctx ON ra.contextid = ctx.id
                  WHERE $wherecondition
                        AND ctx.id $ctxcondition
-                       AND ra.roleid = :roleid";
-         $order = " ORDER BY ctx.depth DESC, ra.component, $sort";
-
-        if (!$this->is_validating()) {
-            $existinguserscount = $DB->count_records_sql($countfields . $sql, $params);
-            if ($existinguserscount > $this->maxusersperpage) {
-                return $this->too_many_results($search, $existinguserscount);
-            }
-        }
-
-        $contextusers = $DB->get_records_sql($fields . $sql . $order, $params);
+                       AND ra.roleid = :roleid
+              ORDER BY ctx.depth DESC, ra.component, $sort";
+        $contextusers = $DB->get_records_sql($sql, $params);
 
         // No users at all.
         if (empty($contextusers)) {

admin/roles/classes/potential_assignees_below_course.php

@@ -48,12 +48,11 @@ class core_role_potential_assignees_below_course extends core_role_assign_user_s
         $fields      = 'SELECT ' . $this->required_fields_sql('u');
         $countfields = 'SELECT COUNT(u.id)';
 
-        $sql   = " FROM ($enrolsql) enrolled_users_view
-                   JOIN {user} u ON u.id = enrolled_users_view.id
-              LEFT JOIN {role_assignments} ra ON (ra.userid = enrolled_users_view.id AND
-                                            ra.roleid = :roleid AND ra.contextid = :contextid)
-                  WHERE ra.id IS NULL
-                        $wherecondition";
+        $sql   = " FROM {user} u
+              LEFT JOIN {role_assignments} ra ON (ra.userid = u.id AND ra.roleid = :roleid AND ra.contextid = :contextid)
+                  WHERE u.id IN ($enrolsql)
+                        $wherecondition
+                        AND ra.id IS NULL";
         $params['contextid'] = $this->context->id;
         $params['roleid'] = $this->roleid;
 

admin/roles/usersroles.php

@@ -132,7 +132,7 @@ if ($courseid == SITEID) {
     $PAGE->set_heading($course->fullname.': '.$fullname);
 }
 echo $OUTPUT->header();
-echo $OUTPUT->heading($title);
+echo $OUTPUT->heading($title, 3);
 echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthnormal');
 
 // Display them.

admin/search.php

@@ -22,6 +22,7 @@ if ($data = data_submitted() and confirm_sesskey()) {
     if (admin_write_settings($data)) {
         $statusmsg = get_string('changessaved');
     }
+    $adminroot = admin_get_root(true); //reload tree
 
     if (!empty($adminroot->errors)) {
         $errormsg = get_string('errorwithsettings', 'admin');
@@ -43,11 +44,10 @@ if ($errormsg !== '') {
 
 $resultshtml = admin_search_settings_html($query); // case insensitive search only
 
-echo '<form action="' . $PAGE->url->out(true) . '" method="post" id="adminsettings">';
+echo '<form action="search.php" method="post" id="adminsettings">';
 echo '<div>';
 echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
-// HACK to prevent browsers from automatically inserting the user's password into the wrong fields.
-echo prevent_form_autofill_password();
+echo '<input type="hidden" name="query" value="'.s($query).'" />';
 echo '</div>';
 echo '<fieldset>';
 echo '<div class="clearer"><!-- --></div>';

admin/settings.php

@@ -48,6 +48,7 @@ if ($data = data_submitted() and confirm_sesskey()) {
         $errormsg = get_string('errorwithsettings', 'admin');
         $firsterror = reset($adminroot->errors);
     }
+    $adminroot = admin_get_root(true); //reload tree
     $settingspage = $adminroot->locate($section, true);
 }
 
@@ -77,8 +78,6 @@ if (empty($SITE->fullname)) {
     echo html_writer::input_hidden_params($PAGE->url);
     echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
     echo '<input type="hidden" name="return" value="'.$return.'" />';
-    // HACK to prevent browsers from automatically inserting the user's password into the wrong fields.
-    echo prevent_form_autofill_password();
 
     echo $settingspage->output_html();
 
@@ -121,8 +120,6 @@ if (empty($SITE->fullname)) {
     echo html_writer::input_hidden_params($PAGE->url);
     echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
     echo '<input type="hidden" name="return" value="'.$return.'" />';
-    // HACK to prevent browsers from automatically inserting the user's password into the wrong fields.
-    echo prevent_form_autofill_password();
     echo $OUTPUT->heading($settingspage->visiblename);
 
     echo $settingspage->output_html();

admin/settings/appearance.php

@@ -23,17 +23,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) { // sp
     $temp->add(new admin_setting_configcheckbox('allowuserblockhiding', new lang_string('allowuserblockhiding', 'admin'), new lang_string('configallowuserblockhiding', 'admin'), 1));
     $temp->add(new admin_setting_configcheckbox('allowblockstodock', new lang_string('allowblockstodock', 'admin'), new lang_string('configallowblockstodock', 'admin'), 1));
     $temp->add(new admin_setting_configtextarea('custommenuitems', new lang_string('custommenuitems', 'admin'), new lang_string('configcustommenuitems', 'admin'), '', PARAM_TEXT, '50', '10'));
-    $temp->add(new admin_setting_configtextarea(
-        'customusermenuitems',
-        new lang_string('customusermenuitems', 'admin'),
-        new lang_string('configcustomusermenuitems', 'admin'),
-        'messages,message|/message/index.php|message
-myfiles,moodle|/user/files.php|download
-mybadges,badges|/badges/mybadges.php|award',
-        PARAM_TEXT,
-        '50',
-        '10'
-    ));
     $temp->add(new admin_setting_configcheckbox('enabledevicedetection', new lang_string('enabledevicedetection', 'admin'), new lang_string('configenabledevicedetection', 'admin'), 1));
     $temp->add(new admin_setting_devicedetectregex('devicedetectregex', new lang_string('devicedetectregex', 'admin'), new lang_string('devicedetectregex_desc', 'admin'), ''));
     $ADMIN->add('themes', $temp);
@@ -64,8 +53,7 @@ mybadges,badges|/badges/mybadges.php|award',
                                               array('0'        => new lang_string('default', 'calendar'),
                                                     '%I:%M %p' => new lang_string('timeformat_12', 'calendar'),
                                                     '%H:%M'    => new lang_string('timeformat_24', 'calendar'))));
-    $temp->add(new admin_setting_configselect('calendar_startwday', new lang_string('configstartwday', 'admin'),
-        new lang_string('helpstartofweek', 'admin'), get_string('firstdayofweek', 'langconfig'),
+    $temp->add(new admin_setting_configselect('calendar_startwday', new lang_string('configstartwday', 'admin'), new lang_string('helpstartofweek', 'admin'), 0,
     array(
             0 => new lang_string('sunday', 'calendar'),
             1 => new lang_string('monday', 'calendar'),
@@ -134,7 +122,6 @@ mybadges,badges|/badges/mybadges.php|award',
     $temp->add(new admin_setting_configcheckbox('navshowcategories', new lang_string('navshowcategories', 'admin'), new lang_string('confignavshowcategories', 'admin'), 1));
     $temp->add(new admin_setting_configcheckbox('navshowmycoursecategories', new lang_string('navshowmycoursecategories', 'admin'), new lang_string('navshowmycoursecategories_help', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('navshowallcourses', new lang_string('navshowallcourses', 'admin'), new lang_string('confignavshowallcourses', 'admin'), 0));
-    $temp->add(new admin_setting_configcheckbox('navexpandmycourses', new lang_string('navexpandmycourses', 'admin'), new lang_string('navexpandmycourses_desc', 'admin'), 1));
     $sortoptions = array(
         'sortorder' => new lang_string('sort_sortorder', 'admin'),
         'fullname' => new lang_string('sort_fullname', 'admin'),

admin/settings/courses.php

@@ -46,7 +46,7 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
     $ADMIN->add('courses',
         new admin_externalpage('restorecourse', new lang_string('restorecourse', 'admin'),
             new moodle_url('/backup/restorefile.php', array('contextid' => context_system::instance()->id)),
-            array('moodle/restore:restorecourse')
+            array('moodle/course:create')
         )
     );
 

admin/settings/development.php

@@ -11,6 +11,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     //TODO: Re-enable cc-import once re-implemented in 2.0.x
     //$temp->add(new admin_setting_configcheckbox('enableimsccimport', new lang_string('enable_cc_import', 'imscc'), new lang_string('enable_cc_import_description', 'imscc'), 0));
     $temp->add(new admin_setting_configcheckbox('enablesafebrowserintegration', new lang_string('enablesafebrowserintegration', 'admin'), new lang_string('configenablesafebrowserintegration', 'admin'), 0));
+    $temp->add(new admin_setting_configcheckbox('enablegroupmembersonly', new lang_string('enablegroupmembersonly', 'admin'), new lang_string('configenablegroupmembersonly', 'admin'), 0));
 
     $temp->add(new admin_setting_configcheckbox('dndallowtextandlinks', new lang_string('dndallowtextandlinks', 'admin'), new lang_string('configdndallowtextandlinks', 'admin'), 0));
     // The CSS optimiser setting. When changed we need to reset the theme caches in order to ensure they are regenerated through the optimiser.

admin/settings/grades.php

@@ -68,15 +68,9 @@ if (has_capability('moodle/grade:manage', $systemcontext)
 
         $temp->add(new admin_setting_special_gradelimiting());
 
-        $temp->add(new admin_setting_configcheckbox('grade_report_showmin',
-                                                    get_string('minimum_show', 'grades'),
-                                                    get_string('minimum_show_help', 'grades'), '1'));
-
         $temp->add(new admin_setting_special_gradepointmax());
 
         $temp->add(new admin_setting_special_gradepointdefault());
-
-        $temp->add(new admin_setting_special_grademinmaxtouse());
     }
     $ADMIN->add('grades', $temp);
 
@@ -98,9 +92,11 @@ if (has_capability('moodle/grade:manage', $systemcontext)
                          GRADE_AGGREGATE_MODE            =>new lang_string('aggregatemode', 'grades'),
                          GRADE_AGGREGATE_SUM             =>new lang_string('aggregatesum', 'grades'));
 
-        $defaultvisible = array(GRADE_AGGREGATE_SUM);
+        $defaultvisible = array(GRADE_AGGREGATE_MEAN, GRADE_AGGREGATE_WEIGHTED_MEAN, GRADE_AGGREGATE_WEIGHTED_MEAN2,
+                                GRADE_AGGREGATE_EXTRACREDIT_MEAN, GRADE_AGGREGATE_MEDIAN, GRADE_AGGREGATE_MIN,
+                                GRADE_AGGREGATE_MAX, GRADE_AGGREGATE_MODE, GRADE_AGGREGATE_SUM);
 
-        $defaults = array('value' => GRADE_AGGREGATE_SUM, 'forced' => false, 'adv' => false);
+        $defaults = array('value'=>GRADE_AGGREGATE_WEIGHTED_MEAN2, 'forced'=>false, 'adv'=>false);
         $temp->add(new admin_setting_gradecat_combo('grade_aggregation', new lang_string('aggregation', 'grades'), new lang_string('aggregation_help', 'grades'), $defaults, $options));
 
         $temp->add(new admin_setting_configmultiselect('grade_aggregations_visible', new lang_string('aggregationsvisible', 'grades'),
@@ -114,6 +110,8 @@ if (has_capability('moodle/grade:manage', $systemcontext)
         $defaults = array('value'=>0, 'forced'=>false, 'adv'=>true);
         $temp->add(new admin_setting_gradecat_combo('grade_aggregateoutcomes', new lang_string('aggregateoutcomes', 'grades'),
                     new lang_string('aggregateoutcomes_help', 'grades'), $defaults, $options));
+        $temp->add(new admin_setting_gradecat_combo('grade_aggregatesubcats', new lang_string('aggregatesubcats', 'grades'),
+                    new lang_string('aggregatesubcats_help', 'grades'), $defaults, $options));
 
         $options = array(0 => new lang_string('none'));
         for ($i=1; $i<=20; $i++) {
@@ -127,9 +125,6 @@ if (has_capability('moodle/grade:manage', $systemcontext)
         $defaults['forced'] = false;
         $temp->add(new admin_setting_gradecat_combo('grade_droplow', new lang_string('droplow', 'grades'),
                     new lang_string('droplow_help', 'grades'), $defaults, $options));
-
-        $temp->add(new admin_setting_configcheckbox('grade_overridecat', new lang_string('overridecat', 'grades'),
-                   new lang_string('overridecat_help', 'grades'), 1));
     }
     $ADMIN->add('grades', $temp);
 

admin/settings/plugins.php

@@ -278,6 +278,9 @@ if ($hassiteconfig) {
     $ADMIN->add('webservicesettings', new admin_externalpage('webservicedocumentation', new lang_string('wsdocapi', 'webservice'), "$CFG->wwwroot/$CFG->admin/webservice/documentation.php", 'moodle/site:config', false));
     /// manage service
     $temp = new admin_settingpage('externalservices', new lang_string('externalservices', 'webservice'));
+    $temp->add(new admin_setting_enablemobileservice('enablemobilewebservice',
+            new lang_string('enablemobilewebservice', 'admin'),
+            new lang_string('configenablemobilewebservice', 'admin', $enablemobiledoclink), 0));
     $temp->add(new admin_setting_heading('manageserviceshelpexplaination', new lang_string('information', 'webservice'), new lang_string('servicehelpexplanation', 'webservice')));
     $temp->add(new admin_setting_manageexternalservices());
     $ADMIN->add('webservicesettings', $temp);
@@ -355,7 +358,7 @@ if ($hassiteconfig || has_capability('moodle/question:config', $systemcontext))
         2 => get_string('showmarkandmax', 'question'),
     );
     $settings->add(new admin_setting_configselect('question_preview/marks',
-            get_string('marks', 'question'), '', 2, $marksoptions));
+            get_string('marks', 'question'), '', 1, $marksoptions));
 
     $settings->add(new admin_setting_configselect('question_preview/markdp',
             get_string('decimalplacesingrades', 'question'), '', 2, array(0, 1, 2, 3, 4, 5, 6, 7)));

admin/settings/security.php

@@ -35,8 +35,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $params = new stdClass();
     $params->bytes = $defaultuserquota;
     $params->displaysize = display_size($defaultuserquota);
-    $temp->add(new admin_setting_configtext('userquota', new lang_string('userquota', 'admin'),
-                new lang_string('configuserquota', 'admin', $params), $defaultuserquota, PARAM_INT, 30));
+    $temp->add(new admin_setting_configtext('userquota', new lang_string('userquota', 'admin'), new lang_string('configuserquota', 'admin', $params), $defaultuserquota));
 
     $temp->add(new admin_setting_configcheckbox('allowobjectembed', new lang_string('allowobjectembed', 'admin'), new lang_string('configallowobjectembed', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('enabletrusttext', new lang_string('enabletrusttext', 'admin'), new lang_string('configenabletrusttext', 'admin'), 0));

admin/settings/server.php

@@ -11,7 +11,6 @@ $temp = new admin_settingpage('systempaths', new lang_string('systempaths','admi
 $temp->add(new admin_setting_configexecutable('pathtodu', new lang_string('pathtodu', 'admin'), new lang_string('configpathtodu', 'admin'), ''));
 $temp->add(new admin_setting_configexecutable('aspellpath', new lang_string('aspellpath', 'admin'), new lang_string('edhelpaspellpath'), ''));
 $temp->add(new admin_setting_configexecutable('pathtodot', new lang_string('pathtodot', 'admin'), new lang_string('pathtodot_help', 'admin'), ''));
-$temp->add(new admin_setting_configexecutable('pathtogs', new lang_string('pathtogs', 'admin'), new lang_string('pathtogs_help', 'admin'), '/usr/bin/gs'));
 $ADMIN->add('server', $temp);
 
 

admin/settings/top.php

@@ -11,7 +11,7 @@ $hassiteconfig = has_capability('moodle/site:config', $systemcontext);
 $ADMIN->add('root', new admin_externalpage('adminnotifications', new lang_string('notifications'), "$CFG->wwwroot/$CFG->admin/index.php"));
 
 $ADMIN->add('root', new admin_externalpage('registrationmoodleorg', new lang_string('registration', 'admin'),
-        "$CFG->wwwroot/$CFG->admin/registration/register.php?huburl=" . HUB_MOODLEORGHUBURL . "&hubname=Moodle.org&sesskey=" . sesskey()));
+        "$CFG->wwwroot/$CFG->admin/registration/register.php?huburl=" . HUB_MOODLEORGHUBURL . "&hubname=Moodle.org"));
 $ADMIN->add('root', new admin_externalpage('registrationhub', new lang_string('registerwith', 'hub'),
         "$CFG->wwwroot/$CFG->admin/registration/register.php", 'moodle/site:config', true));
 $ADMIN->add('root', new admin_externalpage('registrationhubs', new lang_string('hubs', 'admin'),

admin/settings/users.php

@@ -24,44 +24,6 @@ if ($hassiteconfig
     $ADMIN->add('accounts', new admin_externalpage('editusers', new lang_string('userlist','admin'), "$CFG->wwwroot/$CFG->admin/user.php", array('moodle/user:update', 'moodle/user:delete')));
     $ADMIN->add('accounts', new admin_externalpage('userbulk', new lang_string('userbulk','admin'), "$CFG->wwwroot/$CFG->admin/user/user_bulk.php", array('moodle/user:update', 'moodle/user:delete')));
     $ADMIN->add('accounts', new admin_externalpage('addnewuser', new lang_string('addnewuser'), "$securewwwroot/user/editadvanced.php?id=-1", 'moodle/user:create'));
-
-    // "User default preferences" settingpage.
-    $temp = new admin_settingpage('userdefaultpreferences', new lang_string('userdefaultpreferences', 'admin'));
-    if ($ADMIN->fulltree) {
-        $choices = array();
-        $choices['0'] = new lang_string('emaildisplayno');
-        $choices['1'] = new lang_string('emaildisplayyes');
-        $choices['2'] = new lang_string('emaildisplaycourse');
-        $temp->add(new admin_setting_configselect('defaultpreference_maildisplay', new lang_string('emaildisplay'),
-            '', 2, $choices));
-
-        $choices = array();
-        $choices['0'] = new lang_string('textformat');
-        $choices['1'] = new lang_string('htmlformat');
-        $temp->add(new admin_setting_configselect('defaultpreference_mailformat', new lang_string('emailformat'), '', 1, $choices));
-
-        $choices = array();
-        $choices['0'] = new lang_string('emaildigestoff');
-        $choices['1'] = new lang_string('emaildigestcomplete');
-        $choices['2'] = new lang_string('emaildigestsubjects');
-        $temp->add(new admin_setting_configselect('defaultpreference_maildigest', new lang_string('emaildigest'),
-            new lang_string('emaildigest_help'), 0, $choices));
-
-
-        $choices = array();
-        $choices['1'] = new lang_string('autosubscribeyes');
-        $choices['0'] = new lang_string('autosubscribeno');
-        $temp->add(new admin_setting_configselect('defaultpreference_autosubscribe', new lang_string('autosubscribe'),
-            '', 1, $choices));
-
-        $choices = array();
-        $choices['0'] = new lang_string('trackforumsno');
-        $choices['1'] = new lang_string('trackforumsyes');
-        $temp->add(new admin_setting_configselect('defaultpreference_trackforums', new lang_string('trackforums'),
-            '', 0, $choices));
-    }
-    $ADMIN->add('accounts', $temp);
-
     $ADMIN->add('accounts', new admin_externalpage('profilefields', new lang_string('profilefields','admin'), "$CFG->wwwroot/user/profile/index.php", 'moodle/site:config'));
     $ADMIN->add('accounts', new admin_externalpage('cohorts', new lang_string('cohorts', 'cohort'), $CFG->wwwroot . '/cohort/index.php', array('moodle/cohort:manage', 'moodle/cohort:view')));
 
@@ -190,9 +152,6 @@ if ($hassiteconfig
                     'institution' => new lang_string('institution'),
                 )));
         $temp->add(new admin_setting_configtext('fullnamedisplay', new lang_string('fullnamedisplay', 'admin'), new lang_string('configfullnamedisplay', 'admin'), 'language', PARAM_TEXT, 50));
-        $temp->add(new admin_setting_configtext('alternativefullnameformat', new lang_string('alternativefullnameformat', 'admin'),
-                new lang_string('alternativefullnameformat_desc', 'admin'),
-                'language', PARAM_RAW, 50));
         $temp->add(new admin_setting_configtext('maxusersperpage', new lang_string('maxusersperpage','admin'), new lang_string('configmaxusersperpage','admin'), 100, PARAM_INT));
         $temp->add(new admin_setting_configcheckbox('enablegravatar', new lang_string('enablegravatar', 'admin'), new lang_string('enablegravatar_help', 'admin'), 0));
         $temp->add(new admin_setting_configtext('gravatardefaulturl', new lang_string('gravatardefaulturl', 'admin'), new lang_string('gravatardefaulturl_help', 'admin'), 'mm'));

admin/tests/behat/behat_admin.php

@@ -114,30 +114,6 @@ class behat_admin extends behat_base {
         }
     }
 
-    /**
-     * Sets the specified site settings. A table with | config | value | (optional)plugin | is expected.
-     *
-     * @Given /^the following config values are set as admin:$/
-     * @param TableNode $table
-     */
-    public function the_following_config_values_are_set_as_admin(TableNode $table) {
-
-        if (!$data = $table->getRowsHash()) {
-            return;
-        }
-
-        foreach ($data as $config => $value) {
-            // Default plugin value is null.
-            $plugin = null;
-
-            if (is_array($value)) {
-                $plugin = $value[1];
-                $value = $value[0];
-            }
-            set_config($config, $value, $plugin);
-        }
-    }
-
     /**
      * Waits with the provided params if we are running a JS session.
      *

admin/tests/behat/filter_users.feature

@@ -7,10 +7,10 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
   Background:
     Given the following "users" exist:
       | username | firstname | lastname | email | auth | confirmed |
-      | user1 | User | One | one@example.com | manual | 0 |
-      | user2 | User | Two | two@example.com | ldap | 1 |
-      | user3 | User | Three | three@example.com | manual | 1 |
-      | user4 | User | Four | four@example.com | ldap | 0 |
+      | user1 | User | One | one@asd.com | manual | 0 |
+      | user2 | User | Two | two@asd.com | ldap | 1 |
+      | user3 | User | Three | three@asd.com | manual | 1 |
+      | user4 | User | Four | four@asd.com | ldap | 0 |
     And the following "cohorts" exist:
       | name | idnumber |
       | Cohort 1 | CH1 |
@@ -23,8 +23,8 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
       | user2 | C1 | student |
       | user3 | C1 | student |
     And I log in as "admin"
-    And I add "User Two (two@example.com)" user to "CH1" cohort members
-    And I add "User Three (three@example.com)" user to "CH1" cohort members
+    And I add "User Two (two@asd.com)" user to "CH1" cohort members
+    And I add "User Three (three@asd.com)" user to "CH1" cohort members
     And I follow "Browse list of users"
 
   @javascript

admin/tests/behat/set_admin_settings_value.feature

@@ -13,13 +13,15 @@ Feature: Set admin settings value
     And I should not see "C_shortname Course fullname"
 
   Scenario: set admin value with full name
-    Given the following config values are set as admin:
-      | courselistshortnames | 1 |
+    Given I set the following administration settings values:
+      | Display extended course names | 1 |
+    When I press "Save changes"
     And I am on homepage
     Then I should see "C_shortname Course fullname"
 
   Scenario: set admin value with short name
-    Given the following config values are set as admin:
+    Given I set the following administration settings values:
       | courselistshortnames | 1 |
+    When I press "Save changes"
     And I am on homepage
     Then I should see "C_shortname Course fullname"

admin/tests/behat/upload_users.feature

@@ -21,7 +21,7 @@ Feature: Upload users
     And I should see "Tom"
     And I should see "Jones"
     And I should see "verysecret"
-    And I should see "jonest@example.com"
+    And I should see "jonest@someplace.edu"
     And I should see "Reznor"
     And I should see "course1"
     And I should see "math102"
@@ -32,7 +32,7 @@ Feature: Upload users
     And I follow "Browse list of users"
     And I should see "Tom Jones"
     And I should see "Trent Reznor"
-    And I should see "reznor@example.com"
+    And I should see "reznor@someplace.edu"
     And I am on homepage
     And I follow "Maths"
     And I expand "Users" node

admin/tool/assignmentupgrade/version.php

@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2014111000;
-$plugin->requires  = 2014110400;
+$plugin->version   = 2014051200;
+$plugin->requires  = 2014050800;
 $plugin->component = 'tool_assignmentupgrade';
-$plugin->dependencies = array('mod_assign' => 2014110400);
+$plugin->dependencies = array('mod_assign' => 2014050800);

admin/tool/availabilityconditions/tests/behat/manage_conditions.feature

@@ -13,8 +13,8 @@ Feature: Manage availability conditions
     Then I should not see "Availability restrictions"
 
     # Enable it and check I can now see and click on it.
-    And the following config values are set as admin:
-      | enableavailability | 1 |
+    And I set the following administration settings values:
+      | Enable conditional access | 1 |
     And I am on homepage
     And I navigate to "Manage restrictions" node in "Site administration > Plugins > Availability restrictions"
 
@@ -28,9 +28,9 @@ Feature: Manage availability conditions
     Given the following "courses" exist:
       | fullname | shortname | format |
       | Course 1 | C1        | topics |
-    And the following config values are set as admin:
-      | enableavailability | 1 |
     And I log in as "admin"
+    And I set the following administration settings values:
+      | Enable conditional access | 1 |
     And I am on homepage
     When I navigate to "Manage restrictions" node in "Site administration > Plugins > Availability restrictions"
 

admin/tool/availabilityconditions/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2014111000;
-$plugin->requires = 2014110400;
+$plugin->version = 2014051200;
+$plugin->requires = 2014050800;
 $plugin->component = 'tool_availabilityconditions';

admin/tool/behat/cli/init.php

@@ -44,19 +44,13 @@ require_once(__DIR__ . '/../../../../lib/behat/lib.php');
 chdir(__DIR__);
 $output = null;
 exec("php util.php --diag", $output, $code);
-
-// Ensure we have composer installed, before we install or re-install test site.
-if ($code == TESTING_EXITCODE_COMPOSER || $code == BEHAT_EXITCODE_INSTALL || $code == BEHAT_EXITCODE_REINSTALL) {
-    testing_update_composer_dependencies();
-    chdir(__DIR__);
-    exec("php util.php --diag", $output, $code);
-}
-
 if ($code == 0) {
     echo "Behat test environment already installed\n";
 
 } else if ($code == BEHAT_EXITCODE_INSTALL) {
 
+    testing_update_composer_dependencies();
+
     // Behat and dependencies are installed and we need to install the test site.
     chdir(__DIR__);
     passthru("php util.php --install", $code);
@@ -66,6 +60,8 @@ if ($code == 0) {
 
 } else if ($code == BEHAT_EXITCODE_REINSTALL) {
 
+    testing_update_composer_dependencies();
+
     // Test site data is outdated.
     chdir(__DIR__);
     passthru("php util.php --drop", $code);
@@ -78,6 +74,18 @@ if ($code == 0) {
         exit($code);
     }
 
+} else if ($code == BEHAT_EXITCODE_COMPOSER) {
+    // Missing Behat dependencies.
+
+    testing_update_composer_dependencies();
+
+    // Returning to admin/tool/behat/cli.
+    chdir(__DIR__);
+    passthru("php util.php --install", $code);
+    if ($code != 0) {
+        exit($code);
+    }
+
 } else {
     // Generic error, we just output it.
     echo implode("\n", $output)."\n";

admin/tool/behat/renderer.php

@@ -165,7 +165,7 @@ class tool_behat_renderer extends plugin_renderer_base {
         // Info.
         $installurl = behat_command::DOCS_URL . '#Installation';
         $installlink = html_writer::tag('a', $installurl, array('href' => $installurl, 'target' => '_blank'));
-        $writetestsurl = behat_command::DOCS_URL . '#Writing_features';
+        $writetestsurl = behat_command::DOCS_URL . '#Writting_features';
         $writetestslink = html_writer::tag('a', $writetestsurl, array('href' => $writetestsurl, 'target' => '_blank'));
         $writestepsurl = behat_command::DOCS_URL . '#Adding_steps_definitions';
         $writestepslink = html_writer::tag('a', $writestepsurl, array('href' => $writestepsurl, 'target' => '_blank'));

admin/tool/behat/tests/behat/data_generators.feature

@@ -69,8 +69,8 @@ Feature: Set up contextual data for tests
   Scenario: Role overrides
     Given the following "users" exist:
       | username | firstname | lastname | email |
-      | teacher1 | Teacher | 1 | teacher1@example.com |
-      | student1 | Student | 1 | student1@example.com |
+      | teacher1 | Teacher | 1 | teacher1@asd.com |
+      | student1 | Student | 1 | student1@asd.com |
     And the following "categories" exist:
       | name | category | idnumber |
       | Cat 1 | 0 | CAT1 |
@@ -99,7 +99,7 @@ Feature: Set up contextual data for tests
   Scenario: Add course enrolments
     Given the following "users" exist:
       | username | firstname | lastname | email |
-      | student1 | Student | 1 | student1@example.com |
+      | student1 | Student | 1 | student1@asd.com |
     And the following "courses" exist:
       | fullname | shortname | format |
       | Course 1 | C1 | topics |
@@ -117,11 +117,11 @@ Feature: Set up contextual data for tests
       | Custom student         | custom2   |                  |                |
     And the following "users" exist:
       | username | firstname | lastname | email |
-      | user1 | User | 1 | user1@example.com |
-      | user2 | User | 2 | user2@example.com |
-      | user3 | User | 3 | user3@example.com |
-      | user4 | User | 4 | user4@example.com |
-      | user5 | User | 5 | user5@example.com |
+      | user1 | User | 1 | user1@moodlemoodle.com |
+      | user2 | User | 2 | user2@moodlemoodle.com |
+      | user3 | User | 3 | user3@moodlemoodle.com |
+      | user4 | User | 4 | user4@moodlemoodle.com |
+      | user5 | User | 5 | user5@moodlemoodle.com |
     And the following "categories" exist:
       | name | category | idnumber |
       | Cat 1 | 0 | CAT1 |
@@ -185,12 +185,6 @@ Feature: Set up contextual data for tests
       | url        | Test url name          | Test url description          | C1     | url1        |
       | wiki       | Test wiki name         | Test wiki description         | C1     | wiki1       |
       | workshop   | Test workshop name     | Test workshop description     | C1     | workshop1   |
-    And the following "scales" exist:
-      | name | scale |
-      | Test Scale 1 | Disappointing, Good, Very good, Excellent |
-    And the following "activities" exist:
-      | activity   | name                            | intro                         | course | idnumber    | grade |
-      | assign     | Test assignment name with scale | Test assignment description   | C1     | assign1     | Test Scale 1 |
     When I log in as "admin"
     And I follow "Course 1"
     Then I should see "Test assignment name"
@@ -220,17 +214,13 @@ Feature: Set up contextual data for tests
     And I should see "Test workshop name"
     And I follow "Test assignment name"
     And I should see "Test assignment description"
-    And I follow "C1"
-    And I follow "Test assignment name with scale"
-    And I follow "Edit settings"
-    And the field "Type" matches value "Scale"
 
   @javascript
   Scenario: Add relations between users and groups
     Given the following "users" exist:
       | username | firstname | lastname | email |
-      | student1 | Student | 1 | student1@example.com |
-      | student2 | Student | 2 | student2@example.com |
+      | student1 | Student | 1 | student1@asd.com |
+      | student2 | Student | 2 | student2@asd.com |
     And the following "courses" exist:
       | fullname | shortname |
       | Course 1 | C1 |
@@ -262,169 +252,3 @@ Feature: Set up contextual data for tests
     And the "members" select box should contain "Student 1"
     And I set the field "groups" to "Group 2 (1)"
     And the "members" select box should contain "Student 2"
-
-  Scenario: Add cohorts and cohort members with data generator
-    Given the following "categories" exist:
-      | name  | category | idnumber |
-      | Cat 1 | 0        | CAT1     |
-    And the following "users" exist:
-      | username | firstname | lastname | email |
-      | student1 | Student | 1 | student1@example.com |
-      | student2 | Student | 2 | student2@example.com |
-    And the following "cohorts" exist:
-      | name            | idnumber |
-      | System cohort A | CHSA     |
-    And the following "cohorts" exist:
-      | name                 | idnumber | contextlevel | reference |
-      | System cohort B      | CHSB     | System       |           |
-      | Cohort in category   | CHC      | Category     | CAT1      |
-      | Empty cohort         | CHE      | Category     | CAT1      |
-    And the following "cohort members" exist:
-      | user     | cohort |
-      | student1 | CHSA   |
-      | student2 | CHSB   |
-      | student1 | CHSB   |
-      | student1 | CHC    |
-    When I log in as "admin"
-    And I navigate to "Cohorts" node in "Site administration > Users > Accounts"
-    Then the following should exist in the "cohorts" table:
-      | Name            | Cohort size |
-      | System cohort A | 1           |
-      | System cohort B | 2           |
-    And I should not see "Cohort in category"
-    And I follow "Courses"
-    And I follow "Cat 1"
-    And I follow "Cohorts"
-    And I should not see "System cohort"
-    And the following should exist in the "cohorts" table:
-      | Name               | Cohort size |
-      | Cohort in category | 1           |
-      | Empty cohort       | 0           |
-
-  Scenario: Add grade categories with data generator
-    Given the following "courses" exist:
-      | fullname | shortname |
-      | Course 1 | C1 |
-    And the following "grade categories" exist:
-      | fullname | course |
-      | Grade category 1 | C1 |
-    And the following "grade categories" exist:
-      | fullname | course | gradecategory |
-      | Grade sub category 2 | C1 | Grade category 1 |
-    When I log in as "admin"
-    And I follow "Courses"
-    And I follow "Course 1"
-    And I navigate to "Grades" node in "Course administration"
-    Then I should see "Grade category 1"
-    And I should see "Grade sub category 2"
-
-  Scenario: Add a bunch of grade items
-    Given the following "courses" exist:
-      | fullname | shortname |
-      | Course 1 | C1 |
-    And the following "grade categories" exist:
-      | fullname | course |
-      | Grade category 1 | C1 |
-    And the following "grade categories" exist:
-      | fullname | course | gradecategory |
-      | Grade sub category 2 | C1 | Grade category 1 |
-    And the following "grade items" exist:
-      | itemname    | course |
-      | Test Grade Item 1 | C1 |
-    And the following "grade items" exist:
-      | itemname    | course | gradecategory |
-      | Test Grade Item 2 | C1 | Grade category 1 |
-      | Test Grade Item 3 | C1 | Grade sub category 2 |
-    When I log in as "admin"
-    And I follow "Course 1"
-    And I follow "Grades"
-    And I expand "Setup" node
-    And I follow "Categories and items"
-    Then I should see "Test Grade Item 1"
-    And I follow "Edit   Test Grade Item 1"
-    And I expand all fieldsets
-    And I should see "Course 1"
-    And I press "Cancel"
-    And I should see "Grade category 1"
-    And I should see "Test Grade Item 2"
-    And I follow "Edit   Test Grade Item 2"
-    And I expand all fieldsets
-    And I should see "Grade category 1"
-    And I press "Cancel"
-    And I should see "Grade sub category 2"
-    And I should see "Test Grade Item 3"
-    And I follow "Edit   Test Grade Item 3"
-    And I expand all fieldsets
-    And I should see "Grade sub category 2"
-    And I press "Cancel"
-
-  Scenario: Add a bunch of scales
-    Given the following "courses" exist:
-      | fullname | shortname |
-      | Course 1 | C1 |
-    And the following "scales" exist:
-      | name | scale |
-      | Test Scale 1 | Disappointing, Good, Very good, Excellent |
-    When I log in as "admin"
-    And I follow "Course 1"
-    And I follow "Grades"
-    And I follow "Scales"
-    Then I should see "Test Scale 1"
-    And I should see "Disappointing,  Good,  Very good,  Excellent"
-
-  Scenario: Add a bunch of outcomes
-    Given the following "courses" exist:
-      | fullname | shortname |
-      | Course 1 | C1        |
-    And the following "scales" exist:
-      | name | scale |
-      | Test Scale 1 | Disappointing, Good, Very good, Excellent |
-    And the following "grade outcomes" exist:
-      | fullname        | shortname | scale        |
-      | Grade outcome 1 | OT1       | Test Scale 1 |
-    And the following "grade outcomes" exist:
-      | fullname        | shortname | course | scale        |
-      | Grade outcome 2 | OT2       | C1     | Test Scale 1 |
-    And the following config values are set as admin:
-      | enableoutcomes | 1 |
-    When I log in as "admin"
-    And I follow "Home"
-    And I follow "Course 1"
-    And I follow "Outcomes"
-    Then I should see "Grade outcome 1" in the "#addoutcomes" "css_element"
-    And I should see "Grade outcome 2" in the "#removeoutcomes" "css_element"
-    And I follow "Edit outcomes"
-    And the following should exist in the "generaltable" table:
-      | Full name       | Short name | Scale        |
-      | Grade outcome 2 | OT2        | Test Scale 1 |
-
-  Scenario: Add a bunch of outcome grade items
-    Given the following "courses" exist:
-      | fullname | shortname |
-      | Course 1 | C1        |
-    And the following "scales" exist:
-      | name         | scale                                     |
-      | Test Scale 1 | Disappointing, Good, Very good, Excellent |
-    And the following "grade outcomes" exist:
-      | fullname        | shortname | course | scale        |
-      | Grade outcome 1 | OT1       | C1     | Test Scale 1 |
-    And the following "grade categories" exist:
-      | fullname         | course |
-      | Grade category 1 | C1     |
-     And the following "grade items" exist:
-       | itemname                  | course | outcome | gradecategory    |
-       | Test Outcome Grade Item 1 | C1     | OT1     | Grade category 1 |
-    And the following config values are set as admin:
-      | enableoutcomes | 1 |
-    When I log in as "admin"
-    And I follow "Home"
-    And I follow "Course 1"
-    And I follow "Grades"
-    And I expand "Setup" node
-    And I follow "Categories and items"
-    Then I should see "Test Outcome Grade Item 1"
-    And I follow "Edit   Test Outcome Grade Item 1"
-    And the field "Outcome" matches value "Grade outcome 1"
-    And I expand all fieldsets
-    And "//div[contains(@class, 'fitem')]/div[contains(@class, 'fitemtitle')]/div[contains(@class, fstaticlabel) and contains(., 'Grade category')]/../../div[contains(@class, 'felement') and contains(., 'Grade category 1')]" "xpath_element" should exist
-    And I press "Cancel"

admin/tool/behat/tests/behat/edit_permissions.feature

@@ -7,7 +7,7 @@ Feature: Edit capabilities
   Background:
     Given the following "users" exist:
       | username | firstname | lastname | email |
-      | teacher1 | Teacher | 1 | teacher1@example.com |
+      | teacher1 | Teacher | 1 | teacher1@asd.com |
     And the following "courses" exist:
       | fullname | shortname | category |
       | Course 1 | C1 | 0 |
@@ -15,6 +15,7 @@ Feature: Edit capabilities
       | user | course | role |
       | teacher1 | C1 | editingteacher |
 
+  @javascript
   Scenario: Default system capabilities modification
     Given I log in as "admin"
     And I set the following system permissions of "Teacher" role:
@@ -29,6 +30,7 @@ Feature: Edit capabilities
     And "moodle/grade:managesharedforms" capability has "Prevent" permission
     And "moodle/course:request" capability has "Prohibit" permission
 
+  @javascript
   Scenario: Course capabilities overrides
     Given I log in as "teacher1"
     And I follow "Course 1"
@@ -39,11 +41,11 @@ Feature: Edit capabilities
       | mod/forum:editanypost | Prevent |
       | mod/forum:addquestion | Allow |
     When I set the field "Advanced role override" to "Student (3)"
-    And I press "Go"
     Then "mod/forum:deleteanypost" capability has "Prohibit" permission
     And "mod/forum:editanypost" capability has "Prevent" permission
     And "mod/forum:addquestion" capability has "Allow" permission
 
+  @javascript
   Scenario: Module capabilities overrides
     Given I log in as "teacher1"
     And I follow "Course 1"
@@ -58,7 +60,6 @@ Feature: Edit capabilities
       | mod/forum:editanypost | Prevent |
       | mod/forum:addquestion | Allow |
     When I set the field "Advanced role override" to "Student (3)"
-    And I press "Go"
     Then "mod/forum:deleteanypost" capability has "Prohibit" permission
     And "mod/forum:editanypost" capability has "Prevent" permission
     And "mod/forum:addquestion" capability has "Allow" permission

admin/tool/behat/tests/behat/get_and_set_fields.feature

@@ -10,9 +10,9 @@ Feature: Verify that all form fields values can be get and set
       | Course 1 | C1 | 0 |
     And the following "users" exist:
       | username | email | firstname | lastname |
-      | student1 | s1@example.com | Student | 1 |
-      | student2 | s2@example.com | Student | 2 |
-      | student3 | s3@example.com | Student | 3 |
+      | student1 | s1@asd.com | Student | 1 |
+      | student2 | s2@asd.com | Student | 2 |
+      | student3 | s3@asd.com | Student | 3 |
     And the following "course enrolments" exist:
       | user | course | role |
       | student1 | C1 | student |
@@ -137,17 +137,6 @@ Feature: Verify that all form fields values can be get and set
     And I press "Save my choice"
     And the field "one" matches value "1"
     And the field "two" matches value ""
-    # Check if field xpath set/match works.
-    And I am on site homepage
-    And I follow "Course 1"
-    And I navigate to "Edit settings" node in "Course administration"
-    And I set the field with xpath "//input[@id='id_idnumber']" to "Course id number"
-    And the field with xpath "//input[@name='idnumber']" matches value "Course id number"
-    And the field with xpath "//input[@name='idnumber']" does not match value ""
-    And I press "Save changes"
-    And I navigate to "Edit settings" node in "Course administration"
-    And the field "Course ID number" matches value "Course id number"
-
 
   Scenario: with JS disabled all form fields getters and setters works as expected
 
@@ -170,7 +159,6 @@ Feature: Verify that all form fields values can be get and set
     And I add a "Lesson" to section "1"
     And I set the following fields to these values:
       | Name | Test lesson |
-      | Description | Test lesson description |
       | available[enabled] | 1 |
     And I set the field "deadline[enabled]" to "1"
     # Checkbox (AJAX) - Checking "the field matches value" before saving.

admin/tool/behat/tests/behat/manipulate_forms.feature

@@ -11,7 +11,6 @@ Feature: Forms manipulation
     When I set the field "First name" to "Field value"
     And I set the field "Text editor" to "Plain text area"
     And I set the field "Unmask" to "1"
-    And I expand all fieldsets
     Then the field "First name" matches value "Field value"
     And the "Text editor" select box should contain "Plain text area"
     And the field "Unmask" matches value "1"

admin/tool/behat/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2014111000;   // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2014110400;   // Requires this Moodle version
+$plugin->version   = 2014051200;   // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2014050800;   // Requires this Moodle version
 $plugin->component = 'tool_behat'; // Full name of the plugin (used for diagnostics)

admin/tool/capability/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2014111000; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2014110400; // Requires this Moodle version.
+$plugin->version   = 2014051200; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2014050800; // Requires this Moodle version.
 $plugin->component = 'tool_capability'; // Full name of the plugin (used for diagnostics).

admin/tool/capability/yui/build/moodle-tool_capability-search/moodle-tool_capability-search-debug.js

@@ -83,6 +83,7 @@ SEARCH.prototype = {
         div.append(label).append(this.input);
 
         this.select.insert(div, 'before');
+        this.select.one('option').setStyle('display', 'none');
 
         this.input.on('keyup', this.typed, this);
         this.select.on('change', this.validate, this);

admin/tool/capability/yui/build/moodle-tool_capability-search/moodle-tool_capability-search-min.js

@@ -1 +1 @@
-YUI.add("moodle-tool_capability-search",function(e,t){var n=function(){n.superclass.constructor.apply(this,arguments)};n.prototype={form:null,select:null,selectoptions:{},input:null,button:null,lastsearch:null,initializer:function(){this.form=e.one("#capability-overview-form"),this.select=this.form.one("select[data-search=capability]"),this.select.setStyle("minWidth",this.select.get("offsetWidth")),this.select.get("options").each(function(e){var t=e.get("value");this.selectoptions[t]=e},this),this.button=this.form.all("input[type=submit]"),this.lastsearch=this.form.one("input[name=search]");var t=e.Node.create('<div id="capabilitysearchui"></div>'),n=e.Node.create('<label for="capabilitysearch">'+this.get("strsearch")+"</label>");this.input=e.Node.create('<input type="text" id="capabilitysearch" />'),t.append(n).append(this.input),this.select.insert(t,"before"),this.input.on("keyup",this.typed,this),this.select.on("change",this.validate,this),this.lastsearch&&(this.input.set("value",this.lastsearch.get("value")),this.typed(),this.select.one("option[selected]")&&this.select.set("scrollTop",this.select.one("option[selected]").get("getX"))),this.validate()},validate:function(){this.button.set("disabled",this.select.get("value")==="")},typed:function(){var e=this.input.get("value"),t=0,n=null,r;this.lastsearch&&this.lastsearch.set("value",e),this.select.all("option").remove();for(r in this.selectoptions)r.indexOf(e)>=0&&(t++,n=this.selectoptions[r],this.select.append(this.selectoptions[r]));t===0?this.input.addClass("error"):(this.input.removeClass("error"),t===1&&n.set("selected",!0)),this.validate()}},e.extend(n,e.Base,n.prototype,{NAME:"tool_capability-search",ATTRS:{strsearch:{}}}),M.tool_capability=M.tool_capability||{},M.tool_capability.init_capability_search=function(e){new n(e)}},"@VERSION@",{requires:["base","node"]});
+YUI.add("moodle-tool_capability-search",function(e,t){var n=function(){n.superclass.constructor.apply(this,arguments)};n.prototype={form:null,select:null,selectoptions:{},input:null,button:null,lastsearch:null,initializer:function(){this.form=e.one("#capability-overview-form"),this.select=this.form.one("select[data-search=capability]"),this.select.setStyle("minWidth",this.select.get("offsetWidth")),this.select.get("options").each(function(e){var t=e.get("value");this.selectoptions[t]=e},this),this.button=this.form.all("input[type=submit]"),this.lastsearch=this.form.one("input[name=search]");var t=e.Node.create('<div id="capabilitysearchui"></div>'),n=e.Node.create('<label for="capabilitysearch">'+this.get("strsearch")+"</label>");this.input=e.Node.create('<input type="text" id="capabilitysearch" />'),t.append(n).append(this.input),this.select.insert(t,"before"),this.select.one("option").setStyle("display","none"),this.input.on("keyup",this.typed,this),this.select.on("change",this.validate,this),this.lastsearch&&(this.input.set("value",this.lastsearch.get("value")),this.typed(),this.select.one("option[selected]")&&this.select.set("scrollTop",this.select.one("option[selected]").get("getX"))),this.validate()},validate:function(){this.button.set("disabled",this.select.get("value")==="")},typed:function(){var e=this.input.get("value"),t=0,n=null,r;this.lastsearch&&this.lastsearch.set("value",e),this.select.all("option").remove();for(r in this.selectoptions)r.indexOf(e)>=0&&(t++,n=this.selectoptions[r],this.select.append(this.selectoptions[r]));t===0?this.input.addClass("error"):(this.input.removeClass("error"),t===1&&n.set("selected",!0)),this.validate()}},e.extend(n,e.Base,n.prototype,{NAME:"tool_capability-search",ATTRS:{strsearch:{}}}),M.tool_capability=M.tool_capability||{},M.tool_capability.init_capability_search=function(e){new n(e)}},"@VERSION@",{requires:["base","node"]});

admin/tool/capability/yui/build/moodle-tool_capability-search/moodle-tool_capability-search.js

@@ -83,6 +83,7 @@ SEARCH.prototype = {
         div.append(label).append(this.input);
 
         this.select.insert(div, 'before');
+        this.select.one('option').setStyle('display', 'none');
 
         this.input.on('keyup', this.typed, this);
         this.select.on('change', this.validate, this);

admin/tool/capability/yui/src/search/js/search.js

@@ -81,6 +81,7 @@ SEARCH.prototype = {
         div.append(label).append(this.input);
 
         this.select.insert(div, 'before');
+        this.select.one('option').setStyle('display', 'none');
 
         this.input.on('keyup', this.typed, this);
         this.select.on('change', this.validate, this);

admin/tool/customlang/db/upgrade.php

@@ -48,8 +48,5 @@ function xmldb_tool_customlang_upgrade($oldversion) {
     // Moodle v2.7.0 release upgrade line.
     // Put any upgrade step following this.
 
-    // Moodle v2.8.0 release upgrade line.
-    // Put any upgrade step following this.
-
     return true;
 }

admin/tool/customlang/edit.php

@@ -63,7 +63,7 @@ if ($translatorsubmitted) {
     $checkin = optional_param('savecheckin', false, PARAM_RAW);
 
     if ($checkin === false) {
-        $nexturl = new moodle_url($PAGE->url, array('p' => $currentpage));
+        $nexturl = $PAGE->url;
     } else {
         $nexturl = new moodle_url('/admin/tool/customlang/index.php', array('action'=>'checkin', 'lng' => $lng, 'sesskey'=>sesskey()));
     }

admin/tool/customlang/renderer.php

@@ -133,7 +133,6 @@ class tool_customlang_renderer extends plugin_renderer_base {
         $output .= html_writer::start_tag('div');
         $output .= html_writer::empty_tag('input', array('type'=>'hidden', 'name'=>'translatorsubmitted', 'value'=>1));
         $output .= html_writer::empty_tag('input', array('type'=>'hidden', 'name'=>'sesskey', 'value'=>sesskey()));
-        $output .= html_writer::empty_tag('input', array('type'=>'hidden', 'name'=>'p', 'value'=>$translator->currentpage));
         $save1   = html_writer::empty_tag('input', array('type'=>'submit', 'name'=>'savecontinue', 'value'=>get_string('savecontinue', 'tool_customlang')));
         $save2   = html_writer::empty_tag('input', array('type'=>'submit', 'name'=>'savecheckin', 'value'=>get_string('savecheckin', 'tool_customlang')));
         $output .= html_writer::tag('fieldset', $save1.$save2, array('class'=>'buttonsbar'));

admin/tool/customlang/version.php

@@ -25,6 +25,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2014111000;
-$plugin->requires  = 2014110400;
+$plugin->version   = 2014051200;
+$plugin->requires  = 2014050800;
 $plugin->component = 'tool_customlang'; // Full name of the plugin (used for diagnostics)

admin/tool/dbtransfer/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2014111000; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2014110400; // Requires this Moodle version.
+$plugin->version   = 2014051200; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2014050800; // Requires this Moodle version.
 $plugin->component = 'tool_dbtransfer'; // Full name of the plugin (used for diagnostics).

admin/tool/generator/classes/course_backend.php

@@ -36,10 +36,6 @@ class tool_generator_course_backend extends tool_generator_backend {
      * @var array Number of sections in course
      */
     private static $paramsections = array(1, 10, 100, 500, 1000, 2000);
-    /**
-     * @var array Number of assignments in course
-     */
-    private static $paramassignments = array(1, 10, 100, 500, 1000, 2000);
     /**
      * @var array Number of Page activities in course
      */
@@ -183,7 +179,6 @@ class tool_generator_course_backend extends tool_generator_backend {
         // Make course.
         $this->course = $this->create_course();
         $this->create_users();
-        $this->create_assignments();
         $this->create_pages();
         $this->create_small_files();
         $this->create_big_files();
@@ -208,13 +203,10 @@ class tool_generator_course_backend extends tool_generator_backend {
      */
     private function create_course() {
         $this->log('createcourse', $this->shortname);
-        $courserecord = array(
-            'shortname' => $this->shortname,
-            'fullname' => get_string('fullname', 'tool_generator',
-                array('size' => get_string('shortsize_' . $this->size, 'tool_generator'))),
-            'numsections' => self::$paramsections[$this->size],
-            'startdate' => usergetmidnight(time())
-        );
+        $courserecord = array('shortname' => $this->shortname,
+                'fullname' => get_string('fullname', 'tool_generator',
+                    array('size' => get_string('shortsize_' . $this->size, 'tool_generator'))),
+                'numsections' => self::$paramsections[$this->size]);
         return $this->generator->create_course($courserecord, array('createsections' => true));
     }
 
@@ -311,7 +303,8 @@ class tool_generator_course_backend extends tool_generator_backend {
             $username = 'tool_generator_' . $textnumber;
 
             // Create user account.
-            $record = array('username' => $username, 'idnumber' => $number);
+            $record = array('firstname' => get_string('firstname', 'tool_generator'),
+                    'lastname' => $number, 'username' => $username);
 
             // We add a user password if it has been specified.
             if (!empty($CFG->tool_generator_users_password)) {
@@ -325,26 +318,6 @@ class tool_generator_course_backend extends tool_generator_backend {
         $this->end_log();
     }
 
-    /**
-     * Creates a number of Assignment activities.
-     */
-    private function create_assignments() {
-        // Set up generator.
-        $assigngenerator = $this->generator->get_plugin_generator('mod_assign');
-
-        // Create assignments.
-        $number = self::$paramassignments[$this->size];
-        $this->log('createassignments', $number, true);
-        for ($i = 0; $i < $number; $i++) {
-            $record = array('course' => $this->course);
-            $options = array('section' => $this->get_target_section());
-            $assigngenerator->create_instance($record, $options);
-            $this->dot($i, $number);
-        }
-
-        $this->end_log();
-    }
-
     /**
      * Creates a number of Page activities.
      */

admin/tool/generator/lang/en/tool_generator.php

@@ -62,6 +62,7 @@ $string['error_nonexistingcourse'] = 'The specified course does not exist';
 $string['error_nopageinstances'] = 'The selected course does not contain page module instances';
 $string['error_notdebugging'] = 'Not available on this server because debugging is not set to DEVELOPER';
 $string['error_nouserspassword'] = 'You need to set $CFG->tool_generator_users_password in config.php to generate the test plan';
+$string['firstname'] = 'Test course user';
 $string['fullname'] = 'Test course: {$a->size}';
 $string['maketestcourse'] = 'Make test course';
 $string['maketestplan'] = 'Make JMeter test plan';
@@ -70,7 +71,6 @@ $string['pluginname'] = 'Development data generator';
 $string['progress_checkaccounts'] = 'Checking user accounts ({$a})';
 $string['progress_coursecompleted'] = 'Course completed ({$a}s)';
 $string['progress_createaccounts'] = 'Creating user accounts ({$a->from} - {$a->to})';
-$string['progress_createassignments'] = 'Creating assignments ({$a})';
 $string['progress_createbigfiles'] = 'Creating big files ({$a})';
 $string['progress_createcourse'] = 'Creating course {$a}';
 $string['progress_createforum'] = 'Creating forum ({$a} posts)';

admin/tool/generator/tests/maketestcourse_test.php

@@ -136,7 +136,7 @@ class tool_generator_maketestcourse_testcase extends advanced_testcase {
         $lastusernumber = 0;
         $discussionstarters = array();
         foreach ($discussions as $discussion) {
-            $usernumber = core_user::get_user($discussion->userid, 'id, idnumber')->idnumber;
+            $usernumber = intval($discussion->lastname);
 
             // Checks that the users are odd numbers.
             $this->assertEquals(1, $usernumber % 2);

admin/tool/generator/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2014111000;
-$plugin->requires = 2014110400;
+$plugin->version = 2014051200;
+$plugin->requires = 2014050800;
 $plugin->component = 'tool_generator';

admin/tool/health/lang/en/tool_health.php

@@ -23,7 +23,7 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['healthnoproblemsfound'] = 'No health problems were found!';
+$string['healthnoproblemsfound'] = 'There is no health problem found!';
 $string['healthproblemsdetected'] = 'Health problems detected!';
 $string['healthproblemsolution'] = 'Health problem solution';
 $string['healthreturntomain'] = 'Continue';

admin/tool/health/version.php

@@ -25,8 +25,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2014111000; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2014110400; // Requires this Moodle version
+$plugin->version   = 2014051200; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2014050800; // Requires this Moodle version
 $plugin->component = 'tool_health'; // Full name of the plugin (used for diagnostics)
 
 $plugin->maturity  = MATURITY_ALPHA; // this version's maturity level

admin/tool/innodb/version.php

@@ -25,6 +25,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2014111000; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2014110400; // Requires this Moodle version
+$plugin->version   = 2014051200; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2014050800; // Requires this Moodle version
 $plugin->component = 'tool_innodb'; // Full name of the plugin (used for diagnostics)

admin/tool/installaddon/lang/en/tool_installaddon.php

@@ -66,7 +66,6 @@ $string['validationmsg_filenotexists'] = 'Extracted file not found';
 $string['validationmsg_filesnumber'] = 'Not enough files found in the package';
 $string['validationmsg_filestatus'] = 'Unable to extract all files';
 $string['validationmsg_filestatus_info'] = 'Attempting to extract file {$a->file} resulted in error \'{$a->status}\'.';
-$string['validationmsg_foundlangfile'] = 'Found language file';
 $string['validationmsg_maturity'] = 'Declared maturity level';
 $string['validationmsg_maturity_help'] = 'The plugin can declare its maturity level. If the maintainer considers the plugin stable, the declared maturity level will read MATURITY_STABLE. All other maturity levels (such as alpha or beta) should be considered unstable and a warning is raised.';
 $string['validationmsg_missingexpectedlangenfile'] = 'English language file name mismatch';

admin/tool/installaddon/version.php

@@ -24,6 +24,6 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component  = 'tool_installaddon';
-$plugin->version    = 2014111000;
-$plugin->requires   = 2014110400;
+$plugin->version    = 2014051200;
+$plugin->requires   = 2014050800;
 $plugin->maturity   = MATURITY_STABLE;

admin/tool/langimport/classes/controller.php

@@ -1,211 +0,0 @@
-<?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/>.
-
-/**
- * Lang import controller
- *
- * @package    tool_langimport
- * @copyright  2014 Dan Poltawski <dan@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace tool_langimport;
-
-defined('MOODLE_INTERNAL') || die();
-require_once($CFG->libdir.'/filelib.php');
-require_once($CFG->libdir.'/componentlib.class.php');
-
-/**
- * Lang import controller
- *
- * @package    tool_langimport
- * @copyright  2014 Dan Poltawski <dan@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class controller {
-    /** @var array list of informational messages */
-    public $info;
-    /** @var array  list of error messages */
-    public $errors;
-    /** @var \lang_installer */
-    private $installer;
-    /** @var array languages available on the remote server */
-    public $availablelangs;
-
-    /**
-     * Constructor.
-     */
-    public function __construct() {
-        make_temp_directory('');
-        make_upload_directory('lang');
-
-        $this->info = array();
-        $this->errors = array();
-        $this->installer = new \lang_installer();
-
-        $this->availablelangs = $this->installer->get_remote_list_of_languages();
-    }
-
-    /**
-     * Install language packs provided
-     *
-     * @param string|array $langs array of langcodes or individual langcodes
-     * @param bool $updating true if updating the langpacks
-     * @return int false if an error encountered or
-     * @throws \moodle_exception when error is encountered installing langpack
-     */
-    public function install_languagepacks($langs, $updating = false) {
-        global $CFG;
-
-        $this->installer->set_queue($langs);
-        $results = $this->installer->run();
-
-        $updatedpacks = 0;
-
-        foreach ($results as $langcode => $langstatus) {
-            switch ($langstatus) {
-                case \lang_installer::RESULT_DOWNLOADERROR:
-                    $a       = new \stdClass();
-                    $a->url  = $this->installer->lang_pack_url($langcode);
-                    $a->dest = $CFG->dataroot.'/lang';
-                    $this->errors[] = get_string('remotedownloaderror', 'error', $a);
-                    throw new \moodle_exception('remotedownloaderror', 'error', $a);
-                    break;
-                case \lang_installer::RESULT_INSTALLED:
-                    $updatedpacks++;
-                    if ($updating) {
-                        event\langpack_updated::event_with_langcode($langcode)->trigger();
-                        $this->info[] = get_string('langpackupdated', 'tool_langimport', $langcode);
-                    } else {
-                        $this->info[] = get_string('langpackinstalled', 'tool_langimport', $langcode);
-                        event\langpack_imported::event_with_langcode($langcode)->trigger();
-                    }
-                    break;
-                case \lang_installer::RESULT_UPTODATE:
-                    $this->info[] = get_string('langpackuptodate', 'tool_langimport', $langcode);
-                    break;
-            }
-        }
-
-        return $updatedpacks;
-    }
-
-    /**
-     * Uninstall language pack
-     *
-     * @param string $lang language code
-     * @return bool true if language succesfull installed
-     */
-    public function uninstall_language($lang) {
-        global $CFG;
-
-        $dest1 = $CFG->dataroot.'/lang/'.$lang;
-        $dest2 = $CFG->dirroot.'/lang/'.$lang;
-        $rm1 = false;
-        $rm2 = false;
-        if (file_exists($dest1)) {
-            $rm1 = remove_dir($dest1);
-        }
-        if (file_exists($dest2)) {
-            $rm2 = remove_dir($dest2);
-        }
-
-        if ($rm1 or $rm2) {
-            $this->info[] = get_string('langpackremoved', 'tool_langimport', $lang);
-            event\langpack_removed::event_with_langcode($lang)->trigger();
-            return true;
-        } else {    // Nothing deleted, possibly due to permission error.
-            $this->errors[] = 'An error has occurred, language pack is not completely uninstalled, please check file permissions';
-            return false;
-        }
-    }
-
-    /**
-     * Updated all install language packs with the latest found on servre
-     *
-     * @return bool true if languages succesfully updated.
-     */
-    public function update_all_installed_languages() {
-        global $CFG;
-
-        if (!$availablelangs = $this->installer->get_remote_list_of_languages()) {
-            $this->errors[] = get_string('cannotdownloadlanguageupdatelist', 'error');
-            return false;
-        }
-
-        $md5array = array();    // Convert to (string)langcode => (string)md5.
-        foreach ($availablelangs as $alang) {
-            $md5array[$alang[0]] = $alang[1];
-        }
-
-        // Filter out unofficial packs.
-        $currentlangs = array_keys(get_string_manager()->get_list_of_translations(true));
-        $updateablelangs = array();
-        foreach ($currentlangs as $clang) {
-            if (!array_key_exists($clang, $md5array)) {
-                $this->info[] = get_string('langpackupdateskipped', 'tool_langimport', $clang);
-                continue;
-            }
-            $dest1 = $CFG->dataroot.'/lang/'.$clang;
-            $dest2 = $CFG->dirroot.'/lang/'.$clang;
-
-            if (file_exists($dest1.'/langconfig.php') || file_exists($dest2.'/langconfig.php')) {
-                $updateablelangs[] = $clang;
-            }
-        }
-
-        // Filter out packs that have the same md5 key.
-        $neededlangs = array();
-        foreach ($updateablelangs as $ulang) {
-            if (!$this->is_installed_lang($ulang, $md5array[$ulang])) {
-                $neededlangs[] = $ulang;
-            }
-        }
-
-        try {
-            $updated = $this->install_languagepacks($neededlangs, true);
-        } catch (\moodle_exception $e) {
-            $this->errors[] = 'An exception occurred while installing language packs: ' . $e->getMessage();
-            return false;
-        }
-
-        if ($updated) {
-            $this->info[] = get_string('langupdatecomplete', 'tool_langimport');
-        } else {
-            $this->info[] = get_string('nolangupdateneeded', 'tool_langimport');
-        }
-
-        return true;
-    }
-
-    /**
-     * checks the md5 of the zip file, grabbed from download.moodle.org,
-     * against the md5 of the local language file from last update
-     * @param string $lang language code
-     * @param string $md5check md5 to check
-     * @return bool true if installed
-     */
-    public function is_installed_lang($lang, $md5check) {
-        global $CFG;
-        $md5file = $CFG->dataroot.'/lang/'.$lang.'/'.$lang.'.md5';
-        if (file_exists($md5file)) {
-            return (file_get_contents($md5file) == $md5check);
-        }
-        return false;
-    }
-}
-
-

admin/tool/langimport/classes/event/langpack_imported.php

@@ -1,115 +0,0 @@
-<?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/>.
-
-/**
- * The langimport langpack imported event.
- *
- * @package    tool_langimport
- * @copyright  2014 Dan Poltawski <dan@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace tool_langimport\event;
-
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * The tool_langimport langpack imported event class.
- *
- * @property-read array $other {
- *      Extra information about event.
- *
- *      - string langcode: the langpage pack code.
- * }
- *
- * @package    tool_langimport
- * @since      Moodle 2.8
- * @copyright  2014 Dan Poltawski <dan@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class langpack_imported extends \core\event\base {
-    /**
-     * Create instance of event.
-     *
-     * @param string $langcode
-     * @return langpack_updated
-     */
-    public static function event_with_langcode($langcode) {
-        $data = array(
-            'context' => \context_system::instance(),
-            'other' => array(
-                'langcode' => $langcode,
-            )
-        );
-
-        return self::create($data);
-    }
-
-    /**
-     * Init method.
-     *
-     * @return void
-     */
-    protected function init() {
-        $this->data['crud'] = 'c';
-        $this->data['edulevel'] = self::LEVEL_OTHER;
-    }
-
-    /**
-     * Returns description of what happened.
-     *
-     * @return string
-     */
-    public function get_description() {
-        return "The language pack '{$this->other['langcode']}' was installed.";
-    }
-
-    /**
-     * Return localised event name.
-     *
-     * @return string
-     */
-    public static function get_name() {
-        return get_string('langpackinstalledevent', 'tool_langimport');
-    }
-
-    /**
-     * Returns relevant URL.
-     *
-     * @return \moodle_url
-     */
-    public function get_url() {
-        return new \moodle_url('/admin/tool/langimport/');
-    }
-
-    /**
-     * Custom validation.
-     *
-     * @throws \coding_exception
-     */
-    protected function validate_data() {
-        parent::validate_data();
-
-        if (!isset($this->other['langcode'])) {
-            throw new \coding_exception('The \'langcode\' value must be set');
-        }
-        // We can't use PARAM_LANG here as the string manager might not be aware of langpack yet.
-        $cleanedlang = clean_param($this->other['langcode'], PARAM_SAFEDIR);
-        if ($cleanedlang !== $this->other['langcode']) {
-            throw new \coding_exception('The \'langcode\' value must be set to a valid language code');
-        }
-    }
-}

admin/tool/langimport/classes/event/langpack_removed.php

@@ -1,116 +0,0 @@
-<?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/>.
-
-/**
- * The langimport langpack removed event.
- *
- * @package    tool_langimport
- * @copyright  2014 Dan Poltawski <dan@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace tool_langimport\event;
-
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * The tool_langimport langpack removed event class.
- *
- * @property-read array $other {
- *      Extra information about event.
- *
- *      - string langcode: the langpage pack code.
- * }
- *
- * @package    tool_langimport
- * @since      Moodle 2.8
- * @copyright  2014 Dan Poltawski <dan@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class langpack_removed extends \core\event\base {
-    /**
-     * Create instance of event.
-     *
-     * @param string $langcode
-     * @return langpack_updated
-     */
-    public static function event_with_langcode($langcode) {
-        $data = array(
-            'context' => \context_system::instance(),
-            'other' => array(
-                'langcode' => $langcode,
-            )
-        );
-
-        return self::create($data);
-    }
-
-    /**
-     * Init method.
-     *
-     * @return void
-     */
-    protected function init() {
-        $this->data['crud'] = 'd';
-        $this->data['edulevel'] = self::LEVEL_OTHER;
-    }
-
-    /**
-     * Returns description of what happened.
-     *
-     * @return string
-     */
-    public function get_description() {
-        return "The language pack '{$this->other['langcode']}' was removed.";
-    }
-
-    /**
-     * Returns relevant URL.
-     *
-     * @return \moodle_url
-     */
-    public function get_url() {
-        return new \moodle_url('/admin/tool/langimport/');
-    }
-
-    /**
-     * Return localised event name.
-     *
-     * @return string
-     */
-    public static function get_name() {
-        return get_string('langpackremovedevent', 'tool_langimport');
-    }
-
-    /**
-     * Custom validation.
-     *
-     * @throws \coding_exception
-     */
-    protected function validate_data() {
-        parent::validate_data();
-
-        if (!isset($this->other['langcode'])) {
-            throw new \coding_exception('The \'langcode\' value must be set');
-        }
-
-        // We can't use PARAM_LANG here as it queries installed strings.
-        $cleanedlang = clean_param($this->other['langcode'], PARAM_SAFEDIR);
-        if ($cleanedlang !== $this->other['langcode']) {
-            throw new \coding_exception('The \'langcode\' value must be set to a valid language code');
-        }
-    }
-}

admin/tool/langimport/classes/event/langpack_updated.php

@@ -1,115 +0,0 @@
-<?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/>.
-
-/**
- * The langimport langpack updated event.
- *
- * @package    tool_langimport
- * @copyright  2014 Dan Poltawski <dan@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace tool_langimport\event;
-
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * The tool_langimport langpack updated event class.
- *
- * @property-read array $other {
- *      Extra information about event.
- *
- *      - string langcode: the langpage pack code.
- * }
- *
- * @package    tool_langimport
- * @since      Moodle 2.8
- * @copyright  2014 Dan Poltawski <dan@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class langpack_updated extends \core\event\base {
-    /**
-     * Create instance of event.
-     *
-     * @param string $langcode
-     * @return langpack_updated
-     */
-    public static function event_with_langcode($langcode) {
-        $data = array(
-            'context' => \context_system::instance(),
-            'other' => array(
-                'langcode' => $langcode,
-            )
-        );
-
-        return self::create($data);
-    }
-
-    /**
-     * Init method.
-     *
-     * @return void
-     */
-    protected function init() {
-        $this->data['crud'] = 'u';
-        $this->data['edulevel'] = self::LEVEL_OTHER;
-    }
-
-    /**
-     * Returns description of what happened.
-     *
-     * @return string
-     */
-    public function get_description() {
-        return "The language pack '{$this->other['langcode']}' was updated.";
-    }
-
-    /**
-     * Return localised event name.
-     *
-     * @return string
-     */
-    public static function get_name() {
-        return get_string('langpackupdatedevent', 'tool_langimport');
-    }
-
-    /**
-     * Returns relevant URL.
-     *
-     * @return \moodle_url
-     */
-    public function get_url() {
-        return new \moodle_url('/admin/tool/langimport/');
-    }
-
-    /**
-     * Custom validation.
-     *
-     * @throws \coding_exception
-     */
-    protected function validate_data() {
-        parent::validate_data();
-
-        if (!isset($this->other['langcode'])) {
-            throw new \coding_exception('The \'langcode\' value must be set');
-        }
-
-        $cleanedlang = clean_param($this->other['langcode'], PARAM_LANG);
-        if ($cleanedlang !== $this->other['langcode']) {
-            throw new \coding_exception('The \'langcode\' value must be set to a valid language code');
-        }
-    }
-}

admin/tool/langimport/classes/task/update_langpacks_task.php

@@ -1,71 +0,0 @@
-<?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/>.
-
-/**
- * A scheduled task for updating langpacks.
- *
- * @package    tool_langimport
- * @copyright  2014 Dan Poltawski <dan@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-namespace tool_langimport\task;
-
-/**
- * A scheduled task for updating langpacks.
- *
- * @package    tool_langimport
- * @copyright  2014 Dan Poltawski <dan@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class update_langpacks_task extends \core\task\scheduled_task {
-
-    /**
-     * Get a descriptive name for this task (shown to admins).
-     *
-     * @return string
-     */
-    public function get_name() {
-        return get_string('updatelangs', 'tool_langimport');
-    }
-
-    /**
-     * Run langpack update
-     */
-    public function execute() {
-        global $CFG;
-
-        if (!empty($CFG->skiplangupgrade)) {
-            mtrace('Langpack update skipped. ($CFG->skiplangupgrade set)');
-
-            return;
-        }
-
-        $controller = new \tool_langimport\controller();
-        if ($controller->update_all_installed_languages()) {
-            foreach ($controller->info as $message) {
-                mtrace($message);
-            }
-            return true;
-        } else {
-            foreach ($controller->errors as $message) {
-                mtrace($message);
-            }
-            return false;
-        }
-
-    }
-
-}

admin/tool/langimport/db/tasks.php

@@ -1,38 +0,0 @@
-<?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/>.
-
-/**
- * Definition of langimport tasks
- *
- * @package   tool_langimport
- * @category  task
- * @copyright 2014 Dan Poltawski <dan@moodle.com>
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-$tasks = array(
-    array(
-        'classname' => 'tool_langimport\task\update_langpacks_task',
-        'blocking' => 0,
-        'minute' => 'R',
-        'hour' => '4',
-        'day' => '*',
-        'month' => '*',
-        'dayofweek' => '*'
-    )
-);

admin/tool/langimport/index.php

@@ -17,7 +17,7 @@
 /**
  * Fetches language packages from download.moodle.org server
  *
- * Language packages are available at https://download.moodle.org/langpack/
+ * Language packages are available at http://download.moodle.org/langpack/
  * in ZIP format together with a file languages.md5 containing their hashes
  * and meta info.
  * Locally, language packs are saved into $CFG->dataroot/lang/
@@ -28,8 +28,10 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-require(__DIR__.'/../../../config.php');
+require(dirname(dirname(dirname(dirname(__FILE__)))) . '/config.php');
 require_once($CFG->libdir.'/adminlib.php');
+require_once($CFG->libdir.'/filelib.php');
+require_once($CFG->libdir.'/componentlib.class.php');
 
 admin_externalpage_setup('toollangimport');
 
@@ -63,17 +65,37 @@ define('UPDATE_ALL_LANG', 5);
 
 get_string_manager()->reset_caches();
 
-$controller = new tool_langimport\controller();
+$notice_ok    = array();
+$notice_error = array();
 
 if (($mode == INSTALLATION_OF_SELECTED_LANG) and confirm_sesskey() and !empty($pack)) {
     core_php_time_limit::raise();
-    $controller->install_languagepacks($pack);
+    make_temp_directory('');
+    make_upload_directory('lang');
+
+    $installer = new lang_installer($pack);
+    $results = $installer->run();
+    foreach ($results as $langcode => $langstatus) {
+        switch ($langstatus) {
+        case lang_installer::RESULT_DOWNLOADERROR:
+            $a       = new stdClass();
+            $a->url  = $installer->lang_pack_url($langcode);
+            $a->dest = $CFG->dataroot.'/lang';
+            print_error('remotedownloaderror', 'error', 'index.php', $a);
+            break;
+        case lang_installer::RESULT_INSTALLED:
+            $notice_ok[] = get_string('langpackinstalled', 'tool_langimport', $langcode);
+            break;
+        case lang_installer::RESULT_UPTODATE:
+            $notice_ok[] = get_string('langpackuptodate', 'tool_langimport', $langcode);
+            break;
+        }
+    }
 }
 
 if ($mode == DELETION_OF_SELECTED_LANG and !empty($uninstalllang)) {
     if ($uninstalllang == 'en') {
-        // TODO.
-        $controller->errors[] = 'English language pack can not be uninstalled';
+        $notice_error[] = 'English language pack can not be uninstalled';
 
     } else if (!$confirm and confirm_sesskey()) {
         echo $OUTPUT->header();
@@ -84,13 +106,120 @@ if ($mode == DELETION_OF_SELECTED_LANG and !empty($uninstalllang)) {
         die;
 
     } else if (confirm_sesskey()) {
-        $controller->uninstall_language($uninstalllang);
+        $dest1 = $CFG->dataroot.'/lang/'.$uninstalllang;
+        $dest2 = $CFG->dirroot.'/lang/'.$uninstalllang;
+        $rm1 = false;
+        $rm2 = false;
+        if (file_exists($dest1)){
+            $rm1 = remove_dir($dest1);
+        }
+        if (file_exists($dest2)){
+            $rm2 = remove_dir($dest2);
+        }
+        if ($rm1 or $rm2) {
+            $notice_ok[] = get_string('langpackremoved', 'tool_langimport');
+        } else {    //nothing deleted, possibly due to permission error
+            $notice_error[] = 'An error has occurred, language pack is not completely uninstalled, please check file permissions';
+        }
     }
 }
 
 if ($mode == UPDATE_ALL_LANG) {
     core_php_time_limit::raise();
-    $controller->update_all_installed_languages();
+
+    $installer = new lang_installer();
+
+    if (!$availablelangs = $installer->get_remote_list_of_languages()) {
+        print_error('cannotdownloadlanguageupdatelist', 'error');
+    }
+    $md5array = array();    // (string)langcode => (string)md5
+    foreach ($availablelangs as $alang) {
+        $md5array[$alang[0]] = $alang[1];
+    }
+
+    // filter out unofficial packs
+    $currentlangs = array_keys(get_string_manager()->get_list_of_translations(true));
+    $updateablelangs = array();
+    foreach ($currentlangs as $clang) {
+        if (!array_key_exists($clang, $md5array)) {
+            $notice_ok[] = get_string('langpackupdateskipped', 'tool_langimport', $clang);
+            continue;
+        }
+        $dest1 = $CFG->dataroot.'/lang/'.$clang;
+        $dest2 = $CFG->dirroot.'/lang/'.$clang;
+
+        if (file_exists($dest1.'/langconfig.php') || file_exists($dest2.'/langconfig.php')){
+            $updateablelangs[] = $clang;
+        }
+    }
+
+    // then filter out packs that have the same md5 key
+    $neededlangs = array();   // all the packs that needs updating
+    foreach ($updateablelangs as $ulang) {
+        if (!is_installed_lang($ulang, $md5array[$ulang])) {
+            $neededlangs[] = $ulang;
+        }
+    }
+
+    make_temp_directory('');
+    make_upload_directory('lang');
+
+    // clean-up currently installed versions of the packs
+    foreach ($neededlangs as $packindex => $pack) {
+        if ($pack == 'en') {
+            continue;
+        }
+
+        // delete old directories
+        $dest1 = $CFG->dataroot.'/lang/'.$pack;
+        $dest2 = $CFG->dirroot.'/lang/'.$pack;
+        $rm1 = false;
+        $rm2 = false;
+        if (file_exists($dest1)) {
+            if (!remove_dir($dest1)) {
+                $notice_error[] = 'Could not delete old directory '.$dest1.', update of '.$pack.' failed, please check permissions.';
+                unset($neededlangs[$packindex]);
+                continue;
+            }
+        }
+        if (file_exists($dest2)) {
+            if (!remove_dir($dest2)) {
+                $notice_error[] = 'Could not delete old directory '.$dest2.', update of '.$pack.' failed, please check permissions.';
+                unset($neededlangs[$packindex]);
+                continue;
+            }
+        }
+    }
+
+    // install all needed language packs
+    $installer->set_queue($neededlangs);
+    $results = $installer->run();
+    $updated = false;    // any packs updated?
+    foreach ($results as $langcode => $langstatus) {
+        switch ($langstatus) {
+        case lang_installer::RESULT_DOWNLOADERROR:
+            $a       = new stdClass();
+            $a->url  = $installer->lang_pack_url($langcode);
+            $a->dest = $CFG->dataroot.'/lang';
+            print_error('remotedownloaderror', 'error', 'index.php', $a);
+            break;
+        case lang_installer::RESULT_INSTALLED:
+            $updated = true;
+            $notice_ok[] = get_string('langpackinstalled', 'tool_langimport', $langcode);
+            break;
+        case lang_installer::RESULT_UPTODATE:
+            $notice_ok[] = get_string('langpackuptodate', 'tool_langimport', $langcode);
+            break;
+        }
+    }
+
+    if ($updated) {
+        $notice_ok[] = get_string('langupdatecomplete', 'tool_langimport');
+    } else {
+        $notice_ok[] = get_string('nolangupdateneeded', 'tool_langimport');
+    }
+
+    unset($installer);
 }
 get_string_manager()->reset_caches();
 
@@ -110,7 +239,9 @@ foreach ($installedlangs as $installedlang => $unused) {
     }
 }
 
-if ($availablelangs = $controller->availablelangs) {
+$installer = new lang_installer();
+
+if ($availablelangs = $installer->get_remote_list_of_languages()) {
     $remote = true;
 } else {
     $remote = false;
@@ -120,18 +251,18 @@ if ($availablelangs = $controller->availablelangs) {
     echo $OUTPUT->box_end();
 }
 
-if ($controller->info) {
-    $info = implode('<br />', $controller->info);
+if ($notice_ok) {
+    $info = implode('<br />', $notice_ok);
     echo $OUTPUT->notification($info, 'notifysuccess');
 }
 
-if ($controller->errors) {
-    $info = implode('<br />', $controller->errors);
+if ($notice_error) {
+    $info = implode('<br />', $notice_error);
     echo $OUTPUT->notification($info, 'notifyproblem');
 }
 
 if ($missingparents) {
-    foreach ($missingparents as $l => $parent) {
+    foreach ($missingparents as $l=>$parent) {
         $a = new stdClass();
         $a->lang   = $installedlangs[$l];
         $a->parent = $parent;
@@ -175,7 +306,7 @@ echo html_writer::end_tag('td');
 // list of available languages
 $options = array();
 foreach ($availablelangs as $alang) {
-    if (!empty($alang[0]) and trim($alang[0]) !== 'en' and !$controller->is_installed_lang($alang[0], $alang[1])) {
+    if (!empty($alang[0]) and trim($alang[0]) !== 'en' and !is_installed_lang($alang[0], $alang[1])) {
         $options[$alang[0]] = $alang[2].' ('.$alang[0].')';
     }
 }
@@ -200,3 +331,23 @@ echo html_writer::end_tag('table');
 echo $OUTPUT->box_end();
 echo $OUTPUT->footer();
 die();
+
+////////////////////////////////////////////////////////////////////////////////
+// Local functions /////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+
+/**
+ * checks the md5 of the zip file, grabbed from download.moodle.org,
+ * against the md5 of the local language file from last update
+ * @param string $lang
+ * @param string $md5check
+ * @return bool
+ */
+function is_installed_lang($lang, $md5check) {
+    global $CFG;
+    $md5file = $CFG->dataroot.'/lang/'.$lang.'/'.$lang.'.md5';
+    if (file_exists($md5file)){
+        return (file_get_contents($md5file) == $md5check);
+    }
+    return false;
+}

admin/tool/langimport/lang/en/tool_langimport.php

@@ -27,21 +27,17 @@ $string['install'] = 'Install selected language pack(s)';
 $string['installedlangs'] = 'Installed language packs';
 $string['langimport'] = 'Language import utility';
 $string['langimportdisabled'] = 'Language import feature has been disabled. You have to update your language packs manually at the file-system level. Do not forget to purge string caches after you do so.';
-$string['langpackinstalled'] = 'Language pack \'{$a}\' was successfully installed';
-$string['langpackinstalledevent'] = 'Language pack installed';
-$string['langpackremoved'] = 'Language pack \'{$a}\' was uninstalled';
-$string['langpackremovedevent'] = 'Language pack uninstalled';
-$string['langpackupdateskipped'] = 'Update of \'{$a}\' language pack skipped';
-$string['langpackuptodate'] = 'Language pack \'{$a}\' is up-to-date';
-$string['langpackupdated'] = 'Language pack \'{$a}\' was successfully updated';
-$string['langpackupdatedevent'] = 'Language pack updated';
+$string['langpackinstalled'] = 'Language pack {$a} was successfully installed';
+$string['langpackremoved'] = 'Language pack was uninstalled';
+$string['langpackupdateskipped'] = 'Update of {$a} language pack skipped';
+$string['langpackuptodate'] = 'Language pack {$a} is up-to-date';
 $string['langupdatecomplete'] = 'Language pack update completed';
 $string['missingcfglangotherroot'] = 'Missing configuration value $CFG->langotherroot';
 $string['missinglangparent'] = 'Missing parent language <em>{$a->parent}</em> of <em>{$a->lang}</em>.';
 $string['nolangupdateneeded'] = 'All your language packs are up to date, no update is needed';
 $string['pluginname'] = 'Language packs';
 $string['purgestringcaches'] = 'Purge string caches';
-$string['remotelangnotavailable'] = 'Because Moodle cannot connect to download.moodle.org, it is not possible for language packs to be installed automatically. Please download the appropriate ZIP file(s) from <a href="https://download.moodle.org/langpack/">download.moodle.org/langpack</a>, copy them to your {$a} directory and unzip them manually.';
+$string['remotelangnotavailable'] = 'Because Moodle cannot connect to download.moodle.org, it is not possible for language packs to be installed automatically. Please download the appropriate ZIP file(s) from <a href="http://download.moodle.org/langpack/">download.moodle.org/langpack</a>, copy them to your {$a} directory and unzip them manually.';
 $string['uninstall'] = 'Uninstall selected language pack';
 $string['uninstallconfirm'] = 'You are about to completely uninstall language pack {$a}, are you sure?';
 $string['updatelangs'] = 'Update all installed language packs';

admin/tool/langimport/tests/behat/behat_tool_langimport.php

@@ -1,81 +0,0 @@
-<?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/>.
-
-/**
- * Behat steps definitions for Language import tool
- *
- * @package   tool_langimport
- * @category  test
- * @copyright 2014 Dan Poltawski <dan@moodle.com>
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-// NOTE: no MOODLE_INTERNAL test here, this file may be required by behat before including /config.php.
-
-require_once(__DIR__ . '/../../../../../lib/behat/behat_base.php');
-
-use Moodle\BehatExtension\Exception\SkippedException;
-
-/**
- * Steps definitions related with the Language import tool
- *
- * @package   tool_langimport
- * @category  test
- * @copyright 2014 Dan Poltawski <dan@moodle.com>
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class behat_tool_langimport extends behat_base {
-
-    /**
-     * This step looks to see if the remote language import tests should be run (indicated by
-     * setting TOOL_LANGIMPORT_REMOTE_TESTS in config.php.
-     *
-     * @Given /^remote langimport tests are enabled$/
-     */
-    public function remote_langimport_tests_are_enabled() {
-        if (!defined('TOOL_LANGIMPORT_REMOTE_TESTS')) {
-            throw new SkippedException('To run the remote langimport tests you must '.
-                'define TOOL_LANGIMPORT_REMOTE_TESTS in config.php');
-        }
-    }
-
-    /**
-     * Downloads a langpack and fakes it being outdated
-     *
-     * @param string $langcode The language code (e.g. en)
-     * @Given /^outdated langpack \'([^\']*)\' is installed$/
-     */
-    public function outdated_langpack_is_installed($langcode) {
-        global $CFG;
-        require_once($CFG->libdir.'/componentlib.class.php');
-
-        // Download the langpack.
-        $dir = make_upload_directory('lang');
-        $installer = new lang_installer($langcode);
-        $result = $installer->run();
-
-        if ($result[$langcode] !== lang_installer::RESULT_INSTALLED) {
-            throw new coding_exception("Failed to install langpack '$langcode'");
-        }
-
-        $path = "$dir/$langcode/$langcode.md5";
-
-        if (!file_exists($path)) {
-            throw new coding_exception("Failed to find '$langcode' checksum");
-        }
-        file_put_contents($path, '000000');
-    }
-}

admin/tool/langimport/tests/behat/manage_langpacks.feature

@@ -1,59 +0,0 @@
-@tool @tool_langimport
-Feature: Manage language packs
-  In order to support different languages
-  As an administrator
-  I need to be able to add, update and remove language packs
-
-
-  Background:
-    Given remote langimport tests are enabled
-
-  # The pirate language pack is used for testing because its small to download.
-
-  Scenario: Install language pack
-    Given I log in as "admin"
-    And I navigate to "Language packs" node in "Site administration > Language"
-    When I set the field "Available language packs" to "English - Pirate (en_ar)"
-    And I press "Install selected language pack(s)"
-    Then I should see "Language pack 'en_ar' was successfully installed"
-    And the "Installed language packs" select box should contain "English - Pirate (en_ar)"
-    And I navigate to "Live logs" node in "Site administration > Reports"
-    And I should see "The language pack 'en_ar' was installed."
-    And I log out
-
-  Scenario: Update language pack
-    Given outdated langpack 'en_ar' is installed
-    And I log in as "admin"
-    And I navigate to "Language packs" node in "Site administration > Language"
-    When I press "Update all installed language packs"
-    Then I should see "Language pack 'en_ar' was successfully updated"
-    And I should see "Language pack update completed"
-    And I navigate to "Live logs" node in "Site administration > Reports"
-    And I should see "The language pack 'en_ar' was updated."
-    And I log out
-
-  Scenario: Try to uninstall language pack
-    Given I log in as "admin"
-    And I navigate to "Language packs" node in "Site administration > Language"
-    And I set the field "Available language packs" to "English - Pirate (en_ar)"
-    And I press "Install selected language pack(s)"
-    When I set the field "Installed language packs" to "English - Pirate (en_ar)"
-    And I press "Uninstall selected language pack"
-    And I press "Continue"
-    Then I should see "Language pack 'en_ar' was uninstalled"
-    And the "Installed language packs" select box should not contain "English - Pirate (en_ar)"
-    And the "Available language packs" select box should contain "English - Pirate (en_ar)"
-    And I navigate to "Live logs" node in "Site administration > Reports"
-    And I should see "The language pack 'en_ar' was removed."
-    And I should see "Language pack uninstalled"
-    And I log out
-
-  Scenario: Try to uninstall English language pack
-    Given I log in as "admin"
-    And I navigate to "Language packs" node in "Site administration > Language"
-    When I set the field "Installed language packs" to "English (en)"
-    And I press "Uninstall selected language pack"
-    Then I should see "English language pack can not be uninstalled"
-    And I navigate to "Live logs" node in "Site administration > Reports"
-    And I should not see "Language pack uninstalled"
-    And I log out

admin/tool/langimport/tests/events_test.php

@@ -1,102 +0,0 @@
-<?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/>.
-
-/**
- * Tests for langimport events.
- *
- * @package    tool_langimport
- * @copyright  2014 Dan Poltawski
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later.
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * Test class for langimport events.
- *
- * @package    tool_langimport
- * @copyright  2014 Dan Poltawski
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later.
- */
-class tool_langimport_events_testcase extends advanced_testcase {
-
-    /**
-     * Setup testcase.
-     */
-    public function setUp() {
-        $this->setAdminUser();
-        $this->resetAfterTest();
-    }
-
-    public function test_langpack_updated() {
-        global $CFG;
-
-        $event = \tool_langimport\event\langpack_updated::event_with_langcode($CFG->lang);
-
-        // Trigger and capture the event.
-        $sink = $this->redirectEvents();
-        $event->trigger();
-        $events = $sink->get_events();
-        $event = reset($events);
-
-        $this->assertInstanceOf('\tool_langimport\event\langpack_updated', $event);
-        $this->assertEquals(context_system::instance(), $event->get_context());
-    }
-
-    public function test_langpack_updated_validation() {
-        $this->setExpectedException('coding_exception', 'The \'langcode\' value must be set to a valid language code');
-
-        \tool_langimport\event\langpack_updated::event_with_langcode('broken langcode');
-    }
-
-    public function test_langpack_installed() {
-        $event = \tool_langimport\event\langpack_imported::event_with_langcode('fr');
-
-        // Trigger and capture the event.
-        $sink = $this->redirectEvents();
-        $event->trigger();
-        $events = $sink->get_events();
-        $event = reset($events);
-
-        $this->assertInstanceOf('\tool_langimport\event\langpack_imported', $event);
-        $this->assertEquals(context_system::instance(), $event->get_context());
-    }
-
-    public function test_langpack_installed_validation() {
-        $this->setExpectedException('coding_exception', 'The \'langcode\' value must be set to a valid language code');
-
-        \tool_langimport\event\langpack_imported::event_with_langcode('broken langcode');
-    }
-
-    public function test_langpack_removed() {
-        $event = \tool_langimport\event\langpack_removed::event_with_langcode('fr');
-
-        // Trigger and capture the event.
-        $sink = $this->redirectEvents();
-        $event->trigger();
-        $events = $sink->get_events();
-        $event = reset($events);
-
-        $this->assertInstanceOf('\tool_langimport\event\langpack_removed', $event);
-        $this->assertEquals(context_system::instance(), $event->get_context());
-    }
-
-    public function test_langpack_removed_validation() {
-        $this->setExpectedException('coding_exception', 'The \'langcode\' value must be set to a valid language code');
-
-        \tool_langimport\event\langpack_removed::event_with_langcode('broken langcode');
-    }
-}

admin/tool/langimport/version.php

@@ -25,6 +25,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2014111000; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2014110400; // Requires this Moodle version
+$plugin->version   = 2014051200; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2014050800; // Requires this Moodle version
 $plugin->component = 'tool_langimport'; // Full name of the plugin (used for diagnostics)

admin/tool/log/classes/log/manager.php

@@ -213,14 +213,11 @@ class manager implements \core\log\manager {
      * @param string $info Additional description information
      * @param int $cm The course_module->id if there is one
      * @param int|\stdClass $user If log regards $user other than $USER
-     * @param string $ip Override the IP, should only be used for restore.
-     * @param int $time Override the log time, should only be used for restore.
      */
-    public function legacy_add_to_log($courseid, $module, $action, $url = '', $info = '',
-                                      $cm = 0, $user = 0, $ip = null, $time = null) {
+    public function legacy_add_to_log($courseid, $module, $action, $url = '', $info = '', $cm = 0, $user = 0) {
         $this->init();
         if (isset($this->stores['logstore_legacy'])) {
-            $this->stores['logstore_legacy']->legacy_add_to_log($courseid, $module, $action, $url, $info, $cm, $user, $ip, $time);
+            $this->stores['logstore_legacy']->legacy_add_to_log($courseid, $module, $action, $url, $info, $cm, $user);
         }
     }
 }

admin/tool/log/db/upgrade.php

@@ -46,8 +46,5 @@ function xmldb_tool_log_upgrade($oldversion) {
     // Moodle v2.7.0 release upgrade line.
     // Put any upgrade step following this.
 
-    // Moodle v2.8.0 release upgrade line.
-    // Put any upgrade step following this.
-
     return true;
 }

admin/tool/log/store/database/db/upgrade.php

@@ -36,8 +36,5 @@ function xmldb_logstore_database_upgrade($oldversion) {
     // Moodle v2.7.0 release upgrade line.
     // Put any upgrade step following this.
 
-    // Moodle v2.8.0 release upgrade line.
-    // Put any upgrade step following this.
-
     return true;
 }

admin/tool/log/store/database/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2014111000; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires = 2014110400; // Requires this Moodle version.
+$plugin->version = 2014051200; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires = 2014050800; // Requires this Moodle version.
 $plugin->component = 'logstore_database'; // Full name of the plugin (used for diagnostics).

admin/tool/log/store/legacy/classes/log/store.php

@@ -91,24 +91,19 @@ class store implements \tool_log\log\store, \core\log\sql_select_reader {
         // Replace the query with hardcoded mappings required for core.
         list($selectwhere, $params, $sort) = self::replace_sql_legacy($selectwhere, $params, $sort);
 
+        $events = array();
         $records = array();
 
         try {
-            // A custom report + on the fly SQL rewriting = a possible exception.
-            $records = $DB->get_recordset_select('log', $selectwhere, $params, $sort, '*', $limitfrom, $limitnum);
+            $records = $DB->get_records_select('log', $selectwhere, $params, $sort, '*', $limitfrom, $limitnum);
         } catch (\moodle_exception $ex) {
             debugging("error converting legacy event data " . $ex->getMessage() . $ex->debuginfo, DEBUG_DEVELOPER);
-            return array();
         }
 
-        $events = array();
-
         foreach ($records as $data) {
             $events[$data->id] = \logstore_legacy\event\legacy_logged::restore_legacy($data);
         }
 
-        $records->close();
-
         return $events;
     }
 
@@ -148,10 +143,8 @@ class store implements \tool_log\log\store, \core\log\sql_select_reader {
      * @param    string $info Additional description information
      * @param    int $cm The course_module->id if there is one
      * @param    int|\stdClass $user If log regards $user other than $USER
-     * @param    string $ip Override the IP, should only be used for restore.
-     * @param    int $time Override the log time, should only be used for restore.
      */
-    public function legacy_add_to_log($courseid, $module, $action, $url, $info, $cm, $user, $ip = null, $time = null) {
+    public function legacy_add_to_log($courseid, $module, $action, $url, $info, $cm, $user) {
         // Note that this function intentionally does not follow the normal Moodle DB access idioms.
         // This is for a good reason: it is the most frequently used DB update function,
         // so it has been optimised for speed.
@@ -179,9 +172,9 @@ class store implements \tool_log\log\store, \core\log\sql_select_reader {
             }
         }
 
-        $remoteaddr = (is_null($ip)) ? getremoteaddr() : $ip;
+        $remoteaddr = getremoteaddr();
 
-        $timenow = (is_null($time)) ? time() : $time;
+        $timenow = time();
         if (!empty($url)) { // Could break doing html_entity_decode on an empty var.
             $url = html_entity_decode($url, ENT_QUOTES, 'UTF-8');
         } else {

admin/tool/log/store/legacy/classes/task/cleanup_task.php

@@ -44,26 +44,11 @@ class cleanup_task extends \core\task\scheduled_task {
     public function execute() {
         global $CFG, $DB;
 
-        if (empty($CFG->loglifetime)) {
-            return;
+        // Delete old logs to save space (this might need a timer to slow it down...).
+        if (!empty($CFG->loglifetime)) { // Value in days.
+            $loglifetime = time(0) - ($CFG->loglifetime * 3600 * 24);
+            $DB->delete_records_select("log", "time < ?", array($loglifetime));
+            mtrace(" Deleted old legacy log records");
         }
-
-        $loglifetime = time() - ($CFG->loglifetime * 3600 * 24); // Value in days.
-        $lifetimep = array($loglifetime);
-        $start = time();
-
-        while ($min = $DB->get_field_select("log", "MIN(time)", "time < ?", $lifetimep)) {
-            // Break this down into chunks to avoid transaction for too long and generally thrashing database.
-            // Experiments suggest deleting one day takes up to a few seconds; probably a reasonable chunk size usually.
-            // If the cleanup has just been enabled, it might take e.g a month to clean the years of logs.
-            $params = array(min($min + 3600 * 24, $loglifetime));
-            $DB->delete_records_select("log", "time < ?", $params);
-            if (time() > $start + 300) {
-                // Do not churn on log deletion for too long each run.
-                break;
-            }
-        }
-
-        mtrace(" Deleted old legacy log records");
     }
 }

admin/tool/log/store/legacy/db/tasks.php

@@ -28,7 +28,7 @@ $tasks = array(
     array(
         'classname' => '\logstore_legacy\task\cleanup_task',
         'blocking' => 0,
-        'minute' => 'R',
+        'minute' => '*',
         'hour' => '5',
         'day' => '*',
         'dayofweek' => '*',

admin/tool/log/store/legacy/tests/store_test.php

@@ -273,33 +273,4 @@ class logstore_legacy_store_testcase extends advanced_testcase {
             $this->assertContains($expectedreport, $reports);
         }
     }
-
-    /**
-     * Test that the legacy log cleanup works correctly.
-     */
-    public function test_cleanup_task() {
-        global $DB;
-
-        $this->resetAfterTest();
-
-        // Create some records spread over various days; test multiple iterations in cleanup.
-        $record = (object) array('time' => time());
-        $DB->insert_record('log', $record);
-        $record->time -= 3600 * 24 * 30;
-        $DB->insert_record('log', $record);
-        $record->time -= 3600 * 24 * 30;
-        $DB->insert_record('log', $record);
-        $record->time -= 3600 * 24 * 30;
-        $DB->insert_record('log', $record);
-        $this->assertEquals(4, $DB->count_records('log'));
-
-        // Remove all logs before "today".
-        set_config('loglifetime', 1);
-
-        $this->expectOutputString(" Deleted old legacy log records\n");
-        $clean = new \logstore_legacy\task\cleanup_task();
-        $clean->execute();
-
-        $this->assertEquals(1, $DB->count_records('log'));
-    }
 }

admin/tool/log/store/legacy/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2014111001; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires = 2014110400; // Requires this Moodle version.
+$plugin->version = 2014051200; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires = 2014050800; // Requires this Moodle version.
 $plugin->component = 'logstore_legacy'; // Full name of the plugin (used for diagnostics).

admin/tool/log/store/standard/classes/log/store.php

@@ -72,7 +72,7 @@ class store implements \tool_log\log\writer, \core\log\sql_internal_reader {
         $sort = self::tweak_sort_by_id($sort);
 
         $events = array();
-        $records = $DB->get_recordset_select('logstore_standard_log', $selectwhere, $params, $sort, '*', $limitfrom, $limitnum);
+        $records = $DB->get_records_select('logstore_standard_log', $selectwhere, $params, $sort, '*', $limitfrom, $limitnum);
 
         foreach ($records as $data) {
             $extra = array('origin' => $data->origin, 'ip' => $data->ip, 'realuserid' => $data->realuserid);
@@ -94,8 +94,6 @@ class store implements \tool_log\log\writer, \core\log\sql_internal_reader {
             }
         }
 
-        $records->close();
-
         return $events;
     }
 

admin/tool/log/store/standard/classes/task/cleanup_task.php

@@ -43,29 +43,12 @@ class cleanup_task extends \core\task\scheduled_task {
      */
     public function execute() {
         global $DB;
-
         $loglifetime = (int)get_config('logstore_standard', 'loglifetime');
 
-        if (empty($loglifetime) || $loglifetime < 0) {
-            return;
+        if ($loglifetime > 0) {
+            $loglifetime = time() - ($loglifetime * 3600 * 24); // Value in days.
+            $DB->delete_records_select("logstore_standard_log", "timecreated < ?", array($loglifetime));
+            mtrace(" Deleted old log records from standard store.");
         }
-
-        $loglifetime = time() - ($loglifetime * 3600 * 24); // Value in days.
-        $lifetimep = array($loglifetime);
-        $start = time();
-
-        while ($min = $DB->get_field_select("logstore_standard_log", "MIN(timecreated)", "timecreated < ?", $lifetimep)) {
-            // Break this down into chunks to avoid transaction for too long and generally thrashing database.
-            // Experiments suggest deleting one day takes up to a few seconds; probably a reasonable chunk size usually.
-            // If the cleanup has just been enabled, it might take e.g a month to clean the years of logs.
-            $params = array(min($min + 3600 * 24, $loglifetime));
-            $DB->delete_records_select("logstore_standard_log", "timecreated < ?", $params);
-            if (time() > $start + 300) {
-                // Do not churn on log deletion for too long each run.
-                break;
-            }
-        }
-
-        mtrace(" Deleted old log records from standard store.");
     }
 }

admin/tool/log/store/standard/db/tasks.php

@@ -28,7 +28,7 @@ $tasks = array(
     array(
         'classname' => '\logstore_standard\task\cleanup_task',
         'blocking' => 0,
-        'minute' => 'R',
+        'minute' => '*',
         'hour' => '4',
         'day' => '*',
         'dayofweek' => '*',

admin/tool/log/store/standard/db/upgrade.php

@@ -114,8 +114,5 @@ function xmldb_logstore_standard_upgrade($oldversion) {
     // Moodle v2.7.0 release upgrade line.
     // Put any upgrade step following this.
 
-    // Moodle v2.8.0 release upgrade line.
-    // Put any upgrade step following this.
-
     return true;
 }

admin/tool/log/store/standard/tests/store_test.php

@@ -218,41 +218,4 @@ class logstore_standard_store_testcase extends advanced_testcase {
             $this->assertContains($expectedreport, $reports);
         }
     }
-
-    /**
-     * Test that the standard log cleanup works correctly.
-     */
-    public function test_cleanup_task() {
-        global $DB;
-
-        $this->resetAfterTest();
-
-        // Create some records spread over various days; test multiple iterations in cleanup.
-        $ctx = context_course::instance(1);
-        $record = (object) array(
-            'edulevel' => 0,
-            'contextid' => $ctx->id,
-            'contextlevel' => $ctx->contextlevel,
-            'contextinstanceid' => $ctx->instanceid,
-            'userid' => 1,
-            'timecreated' => time(),
-        );
-        $DB->insert_record('logstore_standard_log', $record);
-        $record->timecreated -= 3600 * 24 * 30;
-        $DB->insert_record('logstore_standard_log', $record);
-        $record->timecreated -= 3600 * 24 * 30;
-        $DB->insert_record('logstore_standard_log', $record);
-        $record->timecreated -= 3600 * 24 * 30;
-        $DB->insert_record('logstore_standard_log', $record);
-        $this->assertEquals(4, $DB->count_records('logstore_standard_log'));
-
-        // Remove all logs before "today".
-        set_config('loglifetime', 1, 'logstore_standard');
-
-        $this->expectOutputString(" Deleted old log records from standard store.\n");
-        $clean = new \logstore_standard\task\cleanup_task();
-        $clean->execute();
-
-        $this->assertEquals(1, $DB->count_records('logstore_standard_log'));
-    }
 }

admin/tool/log/store/standard/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2014111001; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires = 2014110400; // Requires this Moodle version.
+$plugin->version = 2014051200; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires = 2014050800; // Requires this Moodle version.
 $plugin->component = 'logstore_standard'; // Full name of the plugin (used for diagnostics).

admin/tool/log/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2014111000; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires = 2014110400; // Requires this Moodle version.
+$plugin->version = 2014051200; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires = 2014050800; // Requires this Moodle version.
 $plugin->component = 'tool_log'; // Full name of the plugin (used for diagnostics).

admin/tool/messageinbound/classes/edit_handler_form.php

@@ -1,139 +0,0 @@
-<?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/>.
-
-/**
- * Form to edit handlers.
- *
- * @package    tool_messageinbound
- * @copyright  2014 Andrew Nicols
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-require_once($CFG->libdir . '/formslib.php');
-
-/**
- * Form to edit handlers.
- *
- * @copyright  2014 Andrew Nicols
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class tool_messageinbound_edit_handler_form extends moodleform {
-    public function definition() {
-        $mform = $this->_form;
-
-        $handler = $this->_customdata['handler'];
-
-        // Set up the options for formatting text for descriptions, etc.
-        $formatoptions = new stdClass();
-        $formatoptions->trusted = false;
-        $formatoptions->noclean = false;
-        $formatoptions->smiley = false;
-        $formatoptions->filter = false;
-        $formatoptions->para = true;
-        $formatoptions->newlines = false;
-        $formatoptions->overflowdiv = true;
-
-        // General information about the handler.
-        $mform->addElement('header', 'general', get_string('general'));
-        $mform->addElement('static', 'name', get_string('name', 'tool_messageinbound'),
-            $handler->name);
-        $mform->addElement('static', 'classname', get_string('classname', 'tool_messageinbound'));
-
-        $description = format_text($handler->description, FORMAT_MARKDOWN, $formatoptions);
-
-        $mform->addElement('static', 'description', get_string('description', 'tool_messageinbound'),
-            $description);
-
-        // Items which can be configured.
-        $mform->addElement('header', 'configuration', get_string('configuration'));
-
-        if ($handler->can_change_defaultexpiration()) {
-            // Show option to change expiry only if the handler supports it.
-            $options = array(
-                HOURSECS => get_string('onehour', 'tool_messageinbound'),
-                DAYSECS => get_string('oneday', 'tool_messageinbound'),
-                WEEKSECS => get_string('oneweek', 'tool_messageinbound'),
-                YEARSECS => get_string('oneyear', 'tool_messageinbound'),
-                0 => get_string('noexpiry', 'tool_messageinbound'),
-            );
-            $mform->addElement('select', 'defaultexpiration', get_string('defaultexpiration', 'tool_messageinbound'), $options);
-            $mform->addHelpButton('defaultexpiration', 'defaultexpiration', 'tool_messageinbound');
-        } else {
-            $text = $this->get_defaultexpiration_text($handler);
-            $mform->addElement('static', 'defaultexpiration_fake', get_string('defaultexpiration', 'tool_messageinbound'), $text);
-            $mform->addElement('hidden', 'defaultexpiration');
-            $mform->addHelpButton('defaultexpiration_fake', 'defaultexpiration', 'tool_messageinbound');
-            $mform->setType('defaultexpiration', PARAM_INT);
-        }
-
-        if ($handler->can_change_validateaddress()) {
-            $mform->addElement('checkbox', 'validateaddress', get_string('requirevalidation', 'tool_messageinbound'));
-            $mform->addHelpButton('validateaddress', 'validateaddress', 'tool_messageinbound');
-        } else {
-            if ($handler->validateaddress) {
-                $text = get_string('yes');
-            } else {
-                $text = get_string('no');
-            }
-            $mform->addElement('static', 'validateaddress_fake', get_string('requirevalidation', 'tool_messageinbound'), $text);
-            $mform->addElement('hidden', 'validateaddress');
-            $mform->addHelpButton('validateaddress_fake', 'fixedvalidateaddress', 'tool_messageinbound');
-            $mform->setType('validateaddress', PARAM_INT);
-        }
-
-        if ($handler->can_change_enabled()) {
-            $mform->addElement('checkbox', 'enabled', get_string('enabled', 'tool_messageinbound'));
-        } else {
-            if ($handler->enabled) {
-                $text = get_string('yes');
-            } else {
-                $text = get_string('no');
-            }
-            $mform->addElement('static', 'enabled_fake', get_string('enabled', 'tool_messageinbound'), $text);
-            $mform->addHelpButton('enabled', 'fixedenabled', 'tool_messageinbound');
-            $mform->addElement('hidden', 'enabled');
-            $mform->setType('enabled', PARAM_INT);
-        }
-
-        $this->add_action_buttons(true, get_string('savechanges'));
-    }
-
-    /**
-     * Return a text string representing the selected default expiration for the handler.
-     *
-     * @param \core\message\inbound\handler $handler handler instance.
-     *
-     * @return string localised text string.
-     */
-    protected function get_defaultexpiration_text(\core\message\inbound\handler $handler) {
-        switch($handler->defaultexpiration) {
-            case HOURSECS :
-                    return get_string('onehour', 'tool_messageinbound');
-            case DAYSECS :
-                    return get_string('oneday', 'tool_messageinbound');
-            case WEEKSECS :
-                    return get_string('oneweek', 'tool_messageinbound');
-            case YEARSECS :
-                    return get_string('oneyear', 'tool_messageinbound');
-            case 0:
-                    return get_string('noexpiry', 'tool_messageinbound');
-            default:
-                    return ''; // Should never happen.
-        }
-    }
-}

admin/tool/messageinbound/classes/message/inbound/invalid_recipient_handler.php

@@ -1,95 +0,0 @@
-<?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/>.
-
-/**
- * A Handler to re-process messages which previously failed sender
- * verification.
- *
- * @package    task_messageinbound
- * @copyright  2014 Andrew Nicols
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace tool_messageinbound\message\inbound;
-
-defined('MOODLE_INTERNAL') || die();
-
-require_once($CFG->dirroot . '/repository/lib.php');
-
-/**
- * A Handler to re-process messages which previously failed sender
- * verification.
- *
- * This may happen if the user did not use their registerd e-mail address,
- * the verification hash used had expired, or if some erroneous content was
- * introduced into the content hash.
- *
- * @package    task
- * @copyright  2014 Andrew Nicols
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class invalid_recipient_handler extends \core\message\inbound\handler {
-
-    /**
-     * Do not allow changes to the address validation setting.
-     */
-    public function can_change_validateaddress() {
-        return false;
-    }
-
-    /**
-     * Return a description for the current handler.
-     *
-     * @return string
-     */
-    public function get_description() {
-        return get_string('invalid_recipient_handler', 'tool_messageinbound');
-    }
-
-    /**
-     * Return a name for the current handler.
-     * This appears in the admin pages as a human-readable name.
-     *
-     * @return string
-     */
-    public function get_name() {
-        return get_string('invalid_recipient_handler_name', 'tool_messageinbound');
-    }
-
-    /**
-     * Process a message received and validated by the Inbound Message processor.
-     *
-     * @param $messagedata The Inbound Message record
-     * @param $messagedata The message data packet.
-     * @return bool Whether the message was successfully processed.
-     */
-    public function process_message(\stdClass $record, \stdClass $data) {
-        global $DB;
-
-        if (!$maildata = $DB->get_record('messageinbound_messagelist', array('id' => $record->datavalue))) {
-            // The message requested couldn't be found. Failing here will alert the user that we failed.
-            throw new \core\message\inbound\processing_failed_exception('oldmessagenotfound', 'tool_messageinbound');
-        }
-
-        mtrace("=== Request to re-process message {$record->datavalue} from server.");
-        mtrace("=== Message-Id:\t{$maildata->messageid}");
-        mtrace("=== Recipient:\t{$maildata->address}");
-
-        $manager = new \tool_messageinbound\manager();
-        return $manager->process_existing_message($maildata);
-    }
-
-}