Moodle release 2.6.2

Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>

.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

@@ -26,13 +26,10 @@ CVS
 /.buildpath
 /.cache
 phpunit.xml
-# Composer support. Do not ignore composer.json, or composer.lock. These should be shipped by us.
+# Composer support - only composer.json is to be in git, the rest is installed in each checkout.
 composer.phar
+composer.lock
 /vendor/
 /behat.yml
 */yui/build/*/*-coverage.js
 /lib/yuilib/*/build/*/*-coverage.js
-# lib/yuilib/version/module/module-coverage.js
-/lib/yuilib/*/*/*-coverage.js
-atlassian-ide-plugin.xml
-/node_modules/

.jshintrc

@@ -1,54 +1,48 @@
 {
-    "asi":          false,
-    "bitwise":      true,
-    "boss":         false,
     "browser":      true,
+    "yui":          true,
+    "bitwise":      true,
     "curly":        true,
+    "eqeqeq":       true,
+    "forin":        false,
+    "immed":        true,
+    "newcap":       true,
+    "noarg":        true,
+    "noempty":      true,
+    "nomen":        false,
+    "onevar":       false,
+    "plusplus":     false,
+    "regexp":       false,
+    "strict":       false,
+    "trailing":     true,
+    "unused":       true,
+    "white":        false,
+    "asi":          false,
+    "boss":         false,
     "debug":        false,
-    "eqeqeq":       false,
     "eqnull":       false,
     "es5":          false,
     "esnext":       false,
     "evil":         false,
     "expr":         false,
-    "forin":        false,
     "funcscope":    false,
     "globalstrict": false,
-    "immed":        true,
-    "indent":       4,
     "iterator":     false,
     "lastsemic":    false,
-    "latedef":      true,
     "laxbreak":     true,
     "laxcomma":     false,
     "loopfunc":     false,
-    "maxerr":       500,
-    "maxlen":       132,
     "multistr":     false,
-    "newcap":       true,
-    "noarg":        true,
-    "noempty":      true,
-    "nomen":        false,
     "onecase":      false,
-    "onevar":       false,
-    "passfail":     false,
-    "plusplus":     false,
-    "predef": [
-        "M",
-        "define"
-    ],
     "proto":        false,
     "regexdash":    false,
-    "regexp":       false,
     "scripturl":    false,
     "shadow":       false,
     "smarttabs":    false,
-    "strict":       false,
     "sub":          false,
     "supernew":     false,
-    "trailing":     true,
-    "undef":        true,
-    "unused":       true,
-    "white":        false,
-    "yui":          true
+    "maxerr":       500,
+    "maxlen":       180,
+    "passfail":     false,
+    "latedef":      true
 }

Gruntfile.js

@@ -1,152 +0,0 @@
-// 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/>.
-
-/**
- * @copyright  2014 Andrew Nicols
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-/**
- * Grunt configuration
- */
-
-module.exports = function(grunt) {
-    var path = require('path'),
-        tasks = {},
-        cwd = process.env.PWD || process.cwd();
-
-    // Project configuration.
-    grunt.initConfig({
-        jshint: {
-            options: {jshintrc: '.jshintrc'},
-            files: ['**/amd/src/*.js']
-        },
-        uglify: {
-            dynamic_mappings: {
-                files: grunt.file.expandMapping(
-                    ['**/src/*.js', '!**/node_modules/**'],
-                    '',
-                    {
-                        cwd: cwd,
-                        rename: function(destBase, destPath) {
-                            destPath = destPath.replace('src', 'build');
-                            destPath = destPath.replace('.js', '.min.js');
-                            destPath = path.resolve(cwd, destPath);
-                            return destPath;
-                        }
-                    }
-                )
-            }
-        }
-    });
-
-    tasks.shifter = function() {
-       var  exec = require('child_process').spawn,
-            done = this.async(),
-            args = [],
-            options = {
-                recursive: true,
-                watch: false,
-                walk: false,
-                module: false
-            },
-            shifter;
-
-            args.push( path.normalize(__dirname + '/node_modules/shifter/bin/shifter'));
-
-            // Determine the most appropriate options to run with based upon the current location.
-            if (path.basename(cwd) === 'src') {
-                // Detect whether we're in a src directory.
-                grunt.log.debug('In a src directory');
-                args.push('--walk');
-                options.walk = true;
-            } else if (path.basename(path.dirname(cwd)) === 'src') {
-                // Detect whether we're in a module directory.
-                grunt.log.debug('In a module directory');
-                options.module = true;
-            }
-
-            if (grunt.option('watch')) {
-                if (!options.walk && !options.module) {
-                    grunt.fail.fatal('Unable to watch unless in a src or module directory');
-                }
-
-                // It is not advisable to run with recursivity and watch - this
-                // leads to building the build directory in a race-like fashion.
-                grunt.log.debug('Detected a watch - disabling recursivity');
-                options.recursive = false;
-                args.push('--watch');
-            }
-
-            if (options.recursive) {
-                args.push('--recursive');
-            }
-
-            // Always ignore the node_modules directory.
-            args.push('--excludes', 'node_modules');
-
-            // Add the stderr option if appropriate
-            if (grunt.option('verbose')) {
-                args.push('--lint-stderr');
-            }
-
-            // Actually run shifter.
-            shifter = exec("node", args, {
-                cwd: cwd,
-                stdio: 'inherit',
-                env: process.env
-            });
-
-            // Tidy up after exec.
-            shifter.on('exit', function (code) {
-                if (code) {
-                    grunt.fail.fatal('Shifter failed with code: ' + code);
-                } else {
-                    grunt.log.ok('Shifter build complete.');
-                    done();
-                }
-            });
-    };
-
-    tasks.startup = function() {
-        // Are we in a YUI directory?
-        if (path.basename(path.resolve(cwd, '../../')) == 'yui') {
-            grunt.task.run('shifter');
-        // Are we in an AMD directory?
-        } else if (path.basename(cwd) == 'amd') {
-            grunt.task.run('jshint');
-            grunt.task.run('uglify');
-        } else {
-            // Run them all!.
-            grunt.task.run('shifter');
-            grunt.task.run('jshint');
-            grunt.task.run('uglify');
-        }
-    };
-
-
-    // Register NPM tasks.
-    grunt.loadNpmTasks('grunt-contrib-uglify');
-    grunt.loadNpmTasks('grunt-contrib-jshint');
-
-    // Register the shifter task.
-    grunt.registerTask('shifter', 'Run Shifter against the current directory', tasks.shifter);
-
-    // Register the startup task.
-    grunt.registerTask('startup', 'Run the correct tasks for the current directory', tasks.startup);
-
-    // Register the default task.
-    grunt.registerTask('default', ['startup']);
-};

admin/auth_config.php

@@ -142,14 +142,14 @@ function print_auth_lock_options($auth, $user_fields, $helptext, $retrieveopts,
         $fieldname = $field;
         if ($fieldname === 'lang') {
             $fieldname = get_string('language');
-        } 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 (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;
         } else {
             $fieldname = get_string($fieldname);
         }

admin/category.php

@@ -17,7 +17,7 @@
 /**
  * This file is used to display a categories sub categories, external pages, and settings.
  *
- * @since      Moodle 2.3
+ * @since      2.3
  * @package    admin
  * @copyright  2011 Sam Hemelryk
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -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);
 }
 
@@ -96,26 +97,27 @@ foreach ($settingspage->children as $childpage) {
         $outputhtml .= $OUTPUT->heading(html_writer::link($childpage->url, $childpage->visiblename), 3);
     } else if ($childpage instanceof admin_settingpage) {
         $outputhtml .= $OUTPUT->heading(html_writer::link(new moodle_url('/'.$CFG->admin.'/settings.php', array('section' => $childpage->name)), $childpage->visiblename), 3);
-        // If its a settings page and has settings lets display them.
-        if (!empty($childpage->settings)) {
-            $outputhtml .= html_writer::start_tag('fieldset', array('class' => 'adminsettings'));
-            foreach ($childpage->settings as $setting) {
-                if (empty($setting->nosave)) {
-                    $savebutton = true;
-                }
-                $fullname = $setting->get_full_name();
-                if (array_key_exists($fullname, $adminroot->errors)) {
-                    $data = $adminroot->errors[$fullname]->data;
-                } else {
-                    $data = $setting->get_setting();
-                }
-                $outputhtml .= html_writer::tag('div', '<!-- -->', array('class' => 'clearer'));
-                $outputhtml .= $setting->output_html($data);
-            }
-            $outputhtml .= html_writer::end_tag('fieldset');
-        }
     } else if ($childpage instanceof admin_category) {
         $outputhtml .= $OUTPUT->heading(html_writer::link(new moodle_url('/'.$CFG->admin.'/category.php', array('category' => $childpage->name)), get_string('admincategory', 'admin', $childpage->visiblename)), 3);
+    } else {
+        continue;
+    }
+    if (!empty($childpage->settings)) {
+        $outputhtml .= html_writer::start_tag('fieldset', array('class' => 'adminsettings'));
+        foreach ($childpage->settings as $setting) {
+            if (empty($setting->nosave)) {
+                $savebutton = true;
+            }
+            $fullname = $setting->get_full_name();
+            if (array_key_exists($fullname, $adminroot->errors)) {
+                $data = $adminroot->errors[$fullname]->data;
+            } else {
+                $data = $setting->get_setting();
+            }
+            $outputhtml .= html_writer::tag('div', '<!-- -->', array('class' => 'clearer'));
+            $outputhtml .= $setting->output_html($data);
+        }
+        $outputhtml .= html_writer::end_tag('fieldset');
     }
 }
 if ($savebutton) {
@@ -155,4 +157,4 @@ echo $outputhtml;
 echo html_writer::end_tag('fieldset');
 echo html_writer::end_tag('form');
 
-echo $OUTPUT->footer();
+echo $OUTPUT->footer();

admin/cli/backup.php

@@ -1,119 +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 allows to do backup.
- *
- * @package    core
- * @subpackage cli
- * @copyright  2013 Lancaster University
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', 1);
-
-require(dirname(dirname(dirname(__FILE__))).'/config.php');
-require_once($CFG->libdir.'/clilib.php');
-require_once($CFG->dirroot . '/backup/util/includes/backup_includes.php');
-
-// Now get cli options.
-list($options, $unrecognized) = cli_get_params(array(
-    'courseid' => false,
-    'courseshortname' => '',
-    'destination' => '',
-    'help' => false,
-    ), array('h' => 'help'));
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-if ($options['help'] || !($options['courseid'] || $options['courseshortname'])) {
-    $help = <<<EOL
-Perform backup of the given course.
-
-Options:
---courseid=INTEGER          Course ID for backup.
---courseshortname=STRING    Course shortname for backup.
---destination=STRING        Path where to store backup file. If not set the backup
-                            will be stored within the course backup file area.
--h, --help                  Print out this help.
-
-Example:
-\$sudo -u www-data /usr/bin/php admin/cli/backup.php --courseid=2 --destination=/moodle/backup/\n
-EOL;
-
-    echo $help;
-    die;
-}
-
-$admin = get_admin();
-if (!$admin) {
-    mtrace("Error: No admin account was found");
-    die;
-}
-
-// Do we need to store backup somewhere else?
-$dir = rtrim($options['destination'], '/');
-if (!empty($dir)) {
-    if (!file_exists($dir) || !is_dir($dir) || !is_writable($dir)) {
-        mtrace("Destination directory does not exists or not writable.");
-        die;
-    }
-}
-
-// Check that the course exists.
-if ($options['courseid']) {
-    $course = $DB->get_record('course', array('id' => $options['courseid']), '*', MUST_EXIST);
-} else if ($options['courseshortname']) {
-    $course = $DB->get_record('course', array('shortname' => $options['courseshortname']), '*', MUST_EXIST);
-}
-
-cli_heading('Performing backup...');
-$bc = new backup_controller(backup::TYPE_1COURSE, $course->id, backup::FORMAT_MOODLE,
-                            backup::INTERACTIVE_YES, backup::MODE_GENERAL, $admin->id);
-// Set the default filename.
-$format = $bc->get_format();
-$type = $bc->get_type();
-$id = $bc->get_id();
-$users = $bc->get_plan()->get_setting('users')->get_value();
-$anonymised = $bc->get_plan()->get_setting('anonymize')->get_value();
-$filename = backup_plan_dbops::get_default_backup_filename($format, $type, $id, $users, $anonymised);
-$bc->get_plan()->get_setting('filename')->set_value($filename);
-
-// Execution.
-$bc->finish_ui();
-$bc->execute_plan();
-$results = $bc->get_results();
-$file = $results['backup_destination']; // May be empty if file already moved to target location.
-
-// Do we need to store backup somewhere else?
-if (!empty($dir)) {
-    if ($file) {
-        mtrace("Writing " . $dir.'/'.$filename);
-        if ($file->copy_content_to($dir.'/'.$filename)) {
-            $file->delete();
-            mtrace("Backup completed.");
-        } else {
-            mtrace("Destination directory does not exist or is not writable. Leaving the backup in the course backup file area.");
-        }
-    }
-} else {
-    mtrace("Backup completed, the new file is listed in the backup area of the given course");
-}
-$bc->destroy();
-exit(0);

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

@@ -69,11 +69,9 @@ Options:
 --prefix=STRING       Table prefix for above database tables. Default is mdl_
 --fullname=STRING     The fullname of the site
 --shortname=STRING    The shortname of the site
---summary=STRING      The summary to be displayed on the front page
 --adminuser=USERNAME  Username for the moodle admin account. Default is admin
 --adminpass=PASSWORD  Password for the moodle admin account,
                       required in non-interactive mode.
---adminemail=STRING   Email address for the moodle admin account.
 --non-interactive     No interactive questions, installation fails if any
                       problem encountered.
 --agree-license       Indicates agreement with software license,
@@ -122,11 +120,10 @@ $olddir = getcwd();
 chdir(dirname($_SERVER['argv'][0]));
 
 // Servers should define a default timezone in php.ini, but if they don't then make sure something is defined.
-if (!function_exists('date_default_timezone_set') or !function_exists('date_default_timezone_get')) {
-    fwrite(STDERR, "Timezone functions are not available.\n");
-    exit(1);
+// This is a quick hack.  Ideally we should ask the admin for a value.  See MDL-22625 for more on this.
+if (function_exists('date_default_timezone_set') and function_exists('date_default_timezone_get')) {
+    @date_default_timezone_set(@date_default_timezone_get());
 }
-date_default_timezone_set(@date_default_timezone_get());
 
 // make sure PHP errors are displayed - helps with diagnosing of problems
 @error_reporting(E_ALL);
@@ -145,10 +142,10 @@ define('PHPUNIT_TEST', false);
 define('IGNORE_COMPONENT_CACHE', true);
 
 // Check that PHP is of a sufficient version
-if (version_compare(phpversion(), "5.4.4") < 0) {
+if (version_compare(phpversion(), "5.3.3") < 0) {
     $phpversion = phpversion();
     // do NOT localise - lang strings would not work here and we CAN NOT move it after installib
-    fwrite(STDERR, "Moodle 2.7 or later requires at least PHP 5.4.4 (currently using version $phpversion).\n");
+    fwrite(STDERR, "Moodle 2.5 or later requires at least PHP 5.3.3 (currently using version $phpversion).\n");
     fwrite(STDERR, "Please upgrade your server software or install older Moodle version.\n");
     exit(1);
 }
@@ -204,9 +201,17 @@ if (defined('COMPONENT_CLASSLOADER')) {
 require($CFG->dirroot.'/version.php');
 $CFG->target_release = $release;
 
-\core\session\manager::init_empty_session();
+$_SESSION = array();
+$_SESSION['SESSION'] = new stdClass();
+$_SESSION['SESSION']->lang = $CFG->lang;
+$_SESSION['USER'] = new stdClass();
+$_SESSION['USER']->id = 0;
+$_SESSION['USER']->mnethostid = 1;
+
 global $SESSION;
 global $USER;
+$SESSION = &$_SESSION['SESSION'];
+$USER    = &$_SESSION['USER'];
 
 global $COURSE;
 $COURSE = new stdClass();
@@ -253,10 +258,8 @@ list($options, $unrecognized) = cli_get_params(
         'prefix'            => 'mdl_',
         'fullname'          => '',
         'shortname'         => '',
-        'summary'           => '',
         'adminuser'         => 'admin',
         'adminpass'         => '',
-        'adminemail'        => '',
         'non-interactive'   => false,
         'agree-license'     => false,
         'allow-unstable'    => false,
@@ -692,20 +695,6 @@ if ($interactive) {
     }
 }
 
-// Ask for the admin email address.
-if ($interactive) {
-    cli_separator();
-    cli_heading(get_string('cliadminemail', 'install'));
-    $prompt = get_string('clitypevaluedefault', 'admin', $options['adminemail']);
-    $options['adminemail'] = cli_input($prompt);
-}
-
-// Validate that the address provided was an e-mail address.
-if (!empty($options['adminemail']) && !validate_email($options['adminemail'])) {
-    $a = (object) array('option' => 'adminemail', 'value' => $options['adminemail']);
-    cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
-}
-
 if ($interactive) {
     if (!$options['agree-license']) {
         cli_separator();

admin/cli/install_database.php

@@ -52,7 +52,6 @@ Options:
 --lang=CODE           Installation and default site language. Default is en.
 --adminuser=USERNAME  Username for the moodle admin account. Default is admin.
 --adminpass=PASSWORD  Password for the moodle admin account.
---adminemail=STRING   Email address for the moodle admin account.
 --agree-license       Indicates agreement with software license.
 --fullname=STRING     Name of the site
 --shortname=STRING    Name of the site
@@ -63,10 +62,10 @@ Example:
 ";
 
 // Check that PHP is of a sufficient version
-if (version_compare(phpversion(), "5.4.4") < 0) {
+if (version_compare(phpversion(), "5.3.3") < 0) {
     $phpversion = phpversion();
     // do NOT localise - lang strings would not work here and we CAN NOT move it after installib
-    fwrite(STDERR, "Moodle 2.7 or later requires at least PHP 5.4.4 (currently using version $phpversion).\n");
+    fwrite(STDERR, "Moodle 2.5 or later requires at least PHP 5.3.3 (currently using version $phpversion).\n");
     fwrite(STDERR, "Please upgrade your server software or install older Moodle version.\n");
     exit(1);
 }
@@ -103,7 +102,6 @@ list($options, $unrecognized) = cli_get_params(
         'lang'              => 'en',
         'adminuser'         => 'admin',
         'adminpass'         => '',
-        'adminemail'        => '',
         'fullname'          => '',
         'shortname'         => '',
         'agree-license'     => false,
@@ -128,12 +126,6 @@ if ($options['adminpass'] === true or $options['adminpass'] === '') {
     cli_error('You have to specify admin password. --help prints out the help'); // TODO: localize
 }
 
-// Validate that the address provided was an e-mail address.
-if (!empty($options['adminemail']) && !validate_email($options['adminemail'])) {
-    $a = (object) array('option' => 'adminemail', 'value' => $options['adminemail']);
-    cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
-}
-
 $options['lang'] = clean_param($options['lang'], PARAM_SAFEDIR);
 if (!file_exists($CFG->dirroot.'/install/lang/'.$options['lang'])) {
     $options['lang'] = 'en';

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_antelope_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_antelope_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_antelope_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/enrol.php

@@ -108,7 +108,7 @@ switch ($action) {
         echo $OUTPUT->header();
 
         // This may take a long time.
-        core_php_time_limit::raise();
+        set_time_limit(0);
 
         // Disable plugin to prevent concurrent cron execution.
         unset($enabled[$enrol]);

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,289 +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>
 </COMPATIBILITY_MATRIX>

admin/handlevirus.php

@@ -0,0 +1,151 @@
+<?php
+/** This expects the output from a command like
+ * clamscan -r --infected --no-summary <files> 2>&1 | php -d error_log=/path/to/log thisfile.php
+ * also it's important that the output of clamscan prints the FULL PATH to each infected file, so use absolute paths for area to scan
+ * also it should be run as root, or whatever the webserver runs as so that it has the right permissions in the quarantine dir etc.
+ * php -d error_log=/path/to/log thisfile.php will override the default error log for php cli, which is stderr, so if you want this script to just print stuff out, use php thisfile.php instead.
+ */
+
+die('TODO: MDL-19380');
+
+$fd = fopen('php://stdin','r');
+if (!$fd) {
+    exit();
+}
+
+require_once(dirname(dirname(__FILE__)).'/config.php');
+require_once($CFG->libdir.'/eventslib.php');
+require_once($CFG->dirroot.'/lib/uploadlib.php'); // contains virus handling stuff.
+
+$site = get_site();
+
+while(!feof($fd)) {
+    $entry = fgets($fd);
+    if (strlen(trim($entry)) == 0) {
+        continue;
+    }
+    if (!$file = validate_line($entry)) {
+        continue;
+    }
+    $bits = explode('/',$file);
+    $a->filename = $bits[count($bits)-1];
+
+    if (!$log = $DB->get_record("log", array("module"=>"upload", "info"=>$file, "action"=>"upload"))) {
+        $a->action = clam_handle_infected_file($file,0,false);
+        clam_replace_infected_file($file);
+        notify_admins_unknown($file,$a);
+        continue;
+    }
+    $action = clam_handle_infected_file($file,$log->userid,true);
+    clam_replace_infected_file($file);
+
+    $ctxselect = ', ' . context_helper::get_preload_record_columns_sql('ctx');
+    $ctxjoin = "LEFT JOIN {context} ctx ON (ctx.instanceid = c.id AND ctx.contextlevel = :contextlevel)";
+    $sql = "SELECT c.id, c.fullname $ctxselect FROM {course} c $ctxjoin WHERE c.id = :courseid";
+    $course = $DB->get_record_sql($sql, array('courseid' => $log->course, 'contextlevel' => CONTEXT_COURSE));
+    context_helper::preload_from_record($course);
+
+    $user = $DB->get_record("user", array("id"=>$log->userid));
+    $subject = get_string('virusfoundsubject','moodle',format_string($site->fullname));
+    $a->date = userdate($log->time);
+
+    $a->action = $action;
+    $a->course = format_string($course->fullname, true, array('context' => context_course::instance($course->id)));
+    $a->user = fullname($user);
+
+    notify_user($user,$subject,$a);
+    notify_admins($user,$subject,$a);
+}
+fclose($fd);
+
+
+function notify_user($user,$subject,$a) {
+
+    if (!$user) {
+        return false;
+    }
+    $body = get_string('virusfoundlater','moodle',$a);
+
+    $eventdata = new stdClass();
+    $eventdata->modulename        = 'moodle';
+    $eventdata->userfrom          = get_admin();
+    $eventdata->userto            = $user;
+    $eventdata->subject           = $subject;
+    $eventdata->fullmessage       = $body;
+    $eventdata->fullmessageformat = FORMAT_PLAIN;
+    $eventdata->fullmessagehtml   = '';
+    $eventdata->smallmessage      = '';
+    message_send($eventdata);
+}
+
+
+function notify_admins($user,$subject,$a) {
+
+    $admins = get_admins();
+
+    $body = get_string('virusfoundlateradmin','moodle',$a);
+    foreach ($admins as $admin) {
+        $eventdata = new stdClass();
+        $eventdata->modulename        = 'moodle';
+        $eventdata->userfrom          = get_admin();
+        $eventdata->userto            = $admin;
+        $eventdata->subject           = $subject;
+        $eventdata->fullmessage       = $body;
+        $eventdata->fullmessageformat = FORMAT_PLAIN;
+        $eventdata->fullmessagehtml   = '';
+        $eventdata->smallmessage      = '';
+        message_send($eventdata);
+    }
+}
+
+function notify_admins_unknown($file,$a) {
+
+    global $site;
+
+    $admins = get_admins();
+    $subject = get_string('virusfoundsubject','moodle',format_string($site->fullname));
+    $body = get_string('virusfoundlateradminnolog','moodle',$a);
+    foreach ($admins as $admin) {
+        $eventdata = new stdClass();
+        $eventdata->modulename        = 'moodle';
+        $eventdata->userfrom          = get_admin();
+        $eventdata->userto            = $admin;
+        $eventdata->subject           = $subject;
+        $eventdata->fullmessage       = $body;
+        $eventdata->fullmessageformat = FORMAT_PLAIN;
+        $eventdata->fullmessagehtml   = '';
+        $eventdata->smallmessage      = '';
+        message_send($eventdata);
+    }
+}
+
+function validate_line($line) {
+    global $CFG;
+    if (strpos($line,"FOUND") === false) {
+        return false;
+    }
+    $index = strpos($line,":");
+    $file = substr($line,0,$index);
+    if (!(strpos($file,$CFG->dataroot) === false)) {
+        if (!file_exists($file)) {
+            return false;
+        }
+    }
+    else {
+        if ($file{0} == "/") {
+            $file = $CFG->dataroot.$file;
+        }
+        else {
+            $file = $CFG->dataroot."/".$file;
+        }
+        if (!file_exists($file)) {
+            return false;
+        }
+    }
+    // clean up
+    $file = preg_replace('/\.\//','/',$file);
+    $file = preg_replace('/\/\//','/',$file);
+    return $file;
+}
+
+

admin/index.php

@@ -30,10 +30,10 @@ if (!file_exists('../config.php')) {
 }
 
 // Check that PHP is of a sufficient version as soon as possible
-if (version_compare(phpversion(), '5.4.4') < 0) {
+if (version_compare(phpversion(), '5.3.3') < 0) {
     $phpversion = phpversion();
     // do NOT localise - lang strings would not work here and we CAN NOT move it to later place
-    echo "Moodle 2.7 or later requires at least PHP 5.4.4 (currently using version $phpversion).<br />";
+    echo "Moodle 2.5 or later requires at least PHP 5.3.3 (currently using version $phpversion).<br />";
     echo "Please upgrade your server software or install older Moodle version.";
     die();
 }
@@ -45,13 +45,6 @@ if (!function_exists('iconv')) {
     die();
 }
 
-// Make sure php5-json is available.
-if (!function_exists('json_encode') || !function_exists('json_decode')) {
-    // This also shouldn't happen.
-    echo 'Moodle requires the json PHP extension. Please install or enable the json extension.';
-    die();
-}
-
 define('NO_OUTPUT_BUFFERING', true);
 
 if ((isset($_GET['cache']) and $_GET['cache'] === '0')
@@ -88,6 +81,7 @@ core_component::get_core_subsystems();
 require_once($CFG->libdir.'/adminlib.php');    // various admin-only functions
 require_once($CFG->libdir.'/upgradelib.php');  // general upgrade/install related functions
 
+$id             = optional_param('id', '', PARAM_TEXT);
 $confirmupgrade = optional_param('confirmupgrade', 0, PARAM_BOOL);
 $confirmrelease = optional_param('confirmrelease', 0, PARAM_BOOL);
 $confirmplugins = optional_param('confirmplugincheck', 0, PARAM_BOOL);
@@ -125,6 +119,10 @@ if (ini_get_bool('session.auto_start')) {
     print_error('phpvaroff', 'debug', '', (object)array('name'=>'session.auto_start', 'link'=>$documentationlink));
 }
 
+if (ini_get_bool('magic_quotes_runtime')) {
+    print_error('phpvaroff', 'debug', '', (object)array('name'=>'magic_quotes_runtime', 'link'=>$documentationlink));
+}
+
 if (!ini_get_bool('file_uploads')) {
     print_error('phpvaron', 'debug', '', (object)array('name'=>'file_uploads', 'link'=>$documentationlink));
 }
@@ -236,13 +234,6 @@ if (!core_tables_exist()) {
 // Check version of Moodle code on disk compared with database
 // and upgrade if possible.
 
-if (!$cache) {
-    // Do not try to do anything fancy in non-cached mode,
-    // this prevents themes from fetching data from non-existent tables.
-    $PAGE->set_pagelayout('maintenance');
-    $PAGE->set_popup_notification_allowed(false);
-}
-
 $stradministration = get_string('administration');
 $PAGE->set_context(context_system::instance());
 
@@ -273,6 +264,9 @@ if (!$cache and $version > $CFG->version) {  // upgrade
     // We then purge the regular caches.
     purge_all_caches();
 
+    $PAGE->set_pagelayout('maintenance');
+    $PAGE->set_popup_notification_allowed(false);
+
     /** @var core_admin_renderer $output */
     $output = $PAGE->get_renderer('core', 'admin');
 
@@ -350,6 +344,8 @@ if (!$cache and $version > $CFG->version) {  // upgrade
         // Always verify plugin dependencies!
         $failed = array();
         if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed)) {
+            $PAGE->set_pagelayout('maintenance');
+            $PAGE->set_popup_notification_allowed(false);
             $reloadurl = new moodle_url('/admin/index.php', array('confirmupgrade' => 1, 'confirmrelease' => 1, 'cache' => 0));
             echo $output->unsatisfied_dependencies_page($version, $failed, $reloadurl);
             die();
@@ -377,9 +373,14 @@ if (!$cache and moodle_needs_upgrading()) {
     if (!$PAGE->headerprinted) {
         // means core upgrade or installation was not already done
 
+        /** @var core_admin_renderer $output */
+        $output = $PAGE->get_renderer('core', 'admin');
+
         if (!$confirmplugins) {
             $strplugincheck = get_string('plugincheck');
 
+            $PAGE->set_pagelayout('maintenance');
+            $PAGE->set_popup_notification_allowed(false);
             $PAGE->navbar->add($strplugincheck);
             $PAGE->set_title($strplugincheck);
             $PAGE->set_heading($strplugincheck);
@@ -394,9 +395,6 @@ if (!$cache and moodle_needs_upgrading()) {
                 redirect($PAGE->url);
             }
 
-            /** @var core_admin_renderer $output */
-            $output = $PAGE->get_renderer('core', 'admin');
-
             $deployer = \core\update\deployer::instance();
             if ($deployer->enabled()) {
                 $deployer->initialize($PAGE->url, $PAGE->url);
@@ -420,8 +418,8 @@ if (!$cache and moodle_needs_upgrading()) {
         // Make sure plugin dependencies are always checked.
         $failed = array();
         if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed)) {
-            /** @var core_admin_renderer $output */
-            $output = $PAGE->get_renderer('core', 'admin');
+            $PAGE->set_pagelayout('maintenance');
+            $PAGE->set_popup_notification_allowed(false);
             $reloadurl = new moodle_url('/admin/index.php', array('cache' => 0));
             echo $output->unsatisfied_dependencies_page($version, $failed, $reloadurl);
             die();
@@ -513,15 +511,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();
@@ -529,10 +519,14 @@ if (empty($site->shortname)) {
     // probably new installation - lets return to frontpage after this step
     // remove settings that we want uninitialised
     unset_config('registerauth');
-    unset_config('timezone'); // Force admin to select timezone!
     redirect('upgradesettings.php?return=site');
 }
 
+// Check if we are returning from moodle.org registration and if so, we mark that fact to remove reminders
+if (!empty($id) and $id == $CFG->siteidentifier) {
+    set_config('registered', time());
+}
+
 // setup critical warnings before printing admin tree block
 $insecuredataroot = is_dataroot_insecure(true);
 $SESSION->admin_critical_warning = ($insecuredataroot==INSECURE_DATAROOT_ERROR);
@@ -558,54 +552,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/lib.php

@@ -18,7 +18,7 @@
 /**
  * This file contains functions used by the admin pages
  *
- * @since Moodle 2.1
+ * @since 2.1
  * @package admin
  * @copyright 2011 Andrew Davis
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later

admin/mnet/index.php

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

admin/mnet/peer_forms.php

@@ -94,15 +94,6 @@ class mnet_review_host_form extends moodleform {
         $mform->setType('wwwroot', PARAM_URL);
         $mform->addRule('wwwroot', get_string('maximumchars', '', 255), 'maxlength', 255, 'client');
 
-        $options = array(
-            mnet_peer::SSL_NONE => get_string('none'),
-            mnet_peer::SSL_HOST => get_string('verifyhostonly', 'core_mnet'),
-            mnet_peer::SSL_HOST_AND_PEER => get_string('verifyhostandpeer', 'core_mnet')
-        );
-        $mform->addElement('select', 'sslverification', get_string('sslverification', 'core_mnet'), $options);
-        $mform->setDefault('sslverification', mnet_peer::SSL_HOST_AND_PEER);
-        $mform->addHelpButton('sslverification', 'sslverification', 'core_mnet');
-
         $themes = array('' => get_string('forceno'));
         foreach (array_keys(core_component::get_plugin_list('theme')) as $themename) {
             $themes[$themename] = get_string('pluginname', 'theme_'.$themename);

admin/mnet/peers.php

@@ -172,7 +172,6 @@ if ($formdata = $reviewform->get_data()) {
     $mnet_peer->public_key          = $formdata->public_key;
     $credentials                    = $mnet_peer->check_credentials($mnet_peer->public_key);
     $mnet_peer->public_key_expires  = $credentials['validTo_time_t'];
-    $mnet_peer->sslverification     = $formdata->sslverification;
 
     if ($mnet_peer->commit()) {
         redirect(new moodle_url('/admin/mnet/peers.php', array('hostid' => $mnet_peer->id)), get_string('changessaved'));

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/mnet/testclient.php

@@ -66,19 +66,12 @@ if (!empty($hostid) && array_key_exists($hostid, $hosts)) {
 
     $mnet_request->set_method('system/listServices');
     $mnet_request->send($mnet_peer);
-
     $services = $mnet_request->response;
     $yesno = array('No', 'Yes');
     $servicenames = array();
 
     echo $OUTPUT->heading(get_string('servicesavailableonhost', 'mnet', $host->wwwroot));
 
-    if (!empty($mnet_request->error)) {
-        echo $OUTPUT->heading(get_string('error'), 3);
-        echo html_writer::alist($mnet_request->error);
-        $services = array();
-    }
-
     $table = new html_table();
     $table->head = array(
         get_string('serviceid', 'mnet'),
@@ -134,7 +127,6 @@ if (!empty($hostid) && array_key_exists($hostid, $hosts)) {
     echo html_writer::table($table);
 
 
-    $mnet_request = new mnet_xmlrpc_client();
     $mnet_request->set_method('system/listMethods');
     if (isset($servicename) && array_key_exists($servicename, $serviceinfo)) {
         echo $OUTPUT->heading(get_string('methodsavailableonhostinservice', 'mnet', (object)array('host' => $host->wwwroot, 'service' => $servicename)));
@@ -147,11 +139,6 @@ if (!empty($hostid) && array_key_exists($hostid, $hosts)) {
     $mnet_request->send($mnet_peer);
     $methods = $mnet_request->response;
 
-    if (!empty($mnet_request->error)) {
-        echo $OUTPUT->heading(get_string('error'), 3);
-        echo html_writer::alist($mnet_request->error);
-        $methods = array();
-    }
 
     $table = new html_table();
     $table->head = array(
@@ -184,12 +171,6 @@ if (!empty($hostid) && array_key_exists($hostid, $hosts)) {
 
         echo $OUTPUT->heading(get_string('methodsignature', 'mnet', $method));
 
-        if (!empty($mnet_request->error)) {
-            echo $OUTPUT->heading(get_string('error'), 3);
-            echo html_writer::alist($mnet_request->error);
-            $signature = array();
-        }
-
         $table = new html_table();
         $table->head = array(
             get_string('position', 'mnet'),

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

@@ -58,14 +58,17 @@ if (!empty($registeredhub) and $registeredhub->token == $token) {
 
     echo $OUTPUT->header();
     echo $OUTPUT->heading(get_string('registrationconfirmed', 'hub'), 3, 'main');
+    $hublink = html_writer::tag('a', $hubname, array('href' => $url));
 
     $registeredhub->token = $newtoken;
     $registeredhub->confirmed = 1;
     $registeredhub->hubname = $hubname;
     $registrationmanager->update_registeredhub($registeredhub);
 
-    // Display notification message.
-    echo $OUTPUT->notification(get_string('registrationconfirmedon', 'hub'), 'notifysuccess');
+    //display notficiation message
+    $notificationmessage = $OUTPUT->notification(
+            get_string('registrationconfirmedon', 'hub', $hublink), 'notifysuccess');
+    echo $notificationmessage;
 
     //display continue button
     $registrationpage = new moodle_url('/admin/registration/index.php');

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'));
@@ -117,7 +118,6 @@ class registration_manager {
      */
     public function add_registeredhub($hub) {
         global $DB;
-        $hub->timemodified = time();
         $id = $DB->insert_record('registration_hubs', $hub);
         return $id;
     }
@@ -171,16 +171,15 @@ class registration_manager {
 
     /**
      * Update a registered hub (mostly use to update the confirmation status)
-     * @param object $hub the hub
+     * @param object $communication the hub
      */
-    public function update_registeredhub($hub) {
+    public function update_registeredhub($communication) {
         global $DB;
-        $hub->timemodified = time();
-        $DB->update_record('registration_hubs', $hub);
+        $DB->update_record('registration_hubs', $communication);
     }
 
     /**
-     * Return all hubs where the site is registered
+     * Return all hubs where the site is registered on
      */
     public function get_registered_on_hubs() {
         global $DB;

admin/registration/register.php

@@ -116,7 +116,6 @@ if ($update and confirm_sesskey()) {
     $xmlrpcclient = new webservice_xmlrpc_client($serverurl, $registeredhub->token);
     try {
         $result = $xmlrpcclient->call($function, $params);
-        $registrationmanager->update_registeredhub($registeredhub); // To update timemodified.
     } catch (Exception $e) {
         $error = $OUTPUT->notification(get_string('errorregistration', 'hub', $e->getMessage()));
     }
@@ -176,20 +175,8 @@ if (!empty($error)) {
     echo $error;
 }
 
-// Some Moodle.org registration explanation.
+//some Moodle.org resitration explanation
 if ($huburl == HUB_MOODLEORGHUBURL) {
-    if (!empty($registeredhub->token)) {
-        if ($registeredhub->timemodified == 0) {
-            $registrationmessage = get_string('pleaserefreshregistrationunknown', 'admin');
-        } else {
-            $lastupdated = userdate($registeredhub->timemodified, get_string('strftimedate', 'langconfig'));
-            $registrationmessage = get_string('pleaserefreshregistration', 'admin', $lastupdated);
-        }
-    } 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

@@ -31,18 +31,18 @@
 class core_register_renderer extends plugin_renderer_base {
 
     /**
-     * Display message about the benefits of registering on Moodle.org
+     * Display Moodle.org registration message about benefit to register on Moodle.org
      *
      * @return string
      */
     public function moodleorg_registration_message() {
-        $moodleorgstatslink = html_writer::link('http://moodle.net/stats',
-                                               get_string('statsmoodleorg', 'admin'),
-                                               array('target' => '_blank'));
-
-        $moodleorgregmsg = get_string('registermoodleorg', 'admin');
+        $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);
 
         //////////////////////////////////////////////////////////////////////////////////////////////////
@@ -564,23 +562,11 @@ class core_admin_renderer extends plugin_renderer_base {
      * @return string HTML to output.
      */
     public function cron_overdue_warning($cronoverdue) {
-        global $CFG;
         if (!$cronoverdue) {
             return '';
         }
 
-        if (empty($CFG->cronclionly)) {
-            $url = new moodle_url('/admin/cron.php');
-            if (!empty($CFG->cronremotepassword)) {
-                $url = new moodle_url('/admin/cron.php', array('password' => $CFG->cronremotepassword));
-            }
-
-            return $this->warning(get_string('cronwarning', 'admin', $url->out()) . ' ' .
-                    $this->help_icon('cron', 'admin'));
-        }
-
-        // $CFG->cronclionly is not empty: cron can run only from CLI.
-        return $this->warning(get_string('cronwarningcli', 'admin') . ' ' .
+        return $this->warning(get_string('cronwarning', 'admin') . ' ' .
                 $this->help_icon('cron', 'admin'));
     }
 
@@ -597,19 +583,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
@@ -637,10 +610,10 @@ class core_admin_renderer extends plugin_renderer_base {
         }
 
         $maturitylevel = get_string('maturity' . $maturity, 'admin');
-        return $this->warning(
+        return $this->box(
                     $this->container(get_string('maturitycorewarning', 'admin', $maturitylevel)) .
                     $this->container($this->doc_link('admin/versions', get_string('morehelp'))),
-                'error');
+                'generalbox maturitywarning');
     }
 
     /*
@@ -655,8 +628,10 @@ class core_admin_renderer extends plugin_renderer_base {
             return '';
         }
 
-        $warning = (get_string('testsiteupgradewarning', 'admin', $testsite));
-        return $this->warning($warning, 'error');
+        return $this->box(
+            $this->container(get_string('testsiteupgradewarning', 'admin', $testsite)),
+            'generalbox testsitewarning'
+        );
     }
 
     /**
@@ -688,16 +663,11 @@ class core_admin_renderer extends plugin_renderer_base {
             return ''; // No worries.
         }
 
-        $level = 'warning';
-
-        if ($maturity == MATURITY_ALPHA) {
-            $level = 'error';
-        }
-
         $maturitylevel = get_string('maturity' . $maturity, 'admin');
-        $warningtext = get_string('maturitycoreinfo', 'admin', $maturitylevel);
-        $warningtext .= ' ' . $this->doc_link('admin/versions', get_string('morehelp'));
-        return $this->warning($warningtext, $level);
+        return $this->box(
+                    get_string('maturitycoreinfo', 'admin', $maturitylevel) . ' ' .
+                    $this->doc_link('admin/versions', get_string('morehelp')),
+                'generalbox adminwarning maturityinfo maturity'.$maturity);
     }
 
     /**
@@ -712,7 +682,7 @@ class core_admin_renderer extends plugin_renderer_base {
      */
     protected function available_updates($updates, $fetch) {
 
-        $updateinfo = '';
+        $updateinfo = $this->box_start('generalbox adminwarning availableupdatesinfo');
         $someupdateavailable = false;
         if (is_array($updates)) {
             if (is_array($updates['core'])) {
@@ -721,8 +691,6 @@ class core_admin_renderer extends plugin_renderer_base {
                 foreach ($updates['core'] as $update) {
                     $updateinfo .= $this->moodle_available_update_info($update);
                 }
-                $updateinfo .= html_writer::tag('p', get_string('updateavailablerecommendation', 'core_admin'),
-                    array('class' => 'updateavailablerecommendation'));
             }
             unset($updates['core']);
             // If something has left in the $updates array now, it is updates for plugins.
@@ -751,7 +719,9 @@ class core_admin_renderer extends plugin_renderer_base {
         }
         $updateinfo .= $this->container_end();
 
-        return $this->warning($updateinfo);
+        $updateinfo .= $this->box_end();
+
+        return $updateinfo;
     }
 
     /**
@@ -1041,28 +1011,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) {
@@ -1070,11 +1031,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));
         }
 
@@ -1215,14 +1176,13 @@ class core_admin_renderer extends plugin_renderer_base {
             get_string('displayname', 'core_plugin'),
             get_string('source', 'core_plugin'),
             get_string('version', 'core_plugin'),
-            get_string('release', 'core_plugin'),
             get_string('availability', 'core_plugin'),
             get_string('actions', 'core_plugin'),
             get_string('notes','core_plugin'),
         );
-        $table->headspan = array(1, 1, 1, 1, 1, 2, 1);
+        $table->headspan = array(1, 1, 1, 1, 2, 1);
         $table->colclasses = array(
-            'pluginname', 'source', 'version', 'release', 'availability', 'settings', 'uninstall', 'notes'
+            'pluginname', 'source', 'version', 'availability', 'settings', 'uninstall', 'notes'
         );
 
         foreach ($plugininfo as $type => $plugins) {
@@ -1278,7 +1238,6 @@ class core_admin_renderer extends plugin_renderer_base {
                 }
 
                 $version = new html_table_cell($plugin->versiondb);
-                $release = new html_table_cell($plugin->release);
 
                 $isenabled = $plugin->is_enabled();
                 if (is_null($isenabled)) {
@@ -1324,7 +1283,7 @@ class core_admin_renderer extends plugin_renderer_base {
                 $notes = new html_table_cell($requiredby.$updateinfo);
 
                 $row->cells = array(
-                    $pluginname, $source, $version, $release, $availability, $settings, $uninstall, $notes
+                    $pluginname, $source, $version, $availability, $settings, $uninstall, $notes
                 );
                 $table->data[] = $row;
             }
@@ -1396,7 +1355,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) {
@@ -1408,10 +1367,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 status', 'leftalign report', 'centeralign info');
         $servertable->attributes['class'] = 'admintable environmenttable generaltable';
         $servertable->id = 'serverstatus';
 
@@ -1421,10 +1379,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';
 
@@ -1440,7 +1397,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();
@@ -1517,8 +1473,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));
@@ -1544,9 +1499,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

@@ -41,9 +41,8 @@ echo $OUTPUT->heading(get_string('reports'));
 $struninstall = get_string('uninstallplugin', 'core_admin');
 
 $table = new flexible_table('reportplugins_administration_table');
-$table->define_columns(array('name', 'logstoressupported', 'version', 'uninstall'));
-$table->define_headers(array(get_string('plugin'), get_string('logstoressupported', 'admin'), get_string('version'),
-        $struninstall));
+$table->define_columns(array('name', 'version', 'uninstall'));
+$table->define_headers(array(get_string('plugin'), get_string('version'), $struninstall));
 $table->define_baseurl($PAGE->url);
 $table->set_attribute('id', 'reportplugins');
 $table->set_attribute('class', 'admintable generaltable');
@@ -72,23 +71,12 @@ foreach ($installed as $config) {
     }
 }
 
-$logmanager = get_log_manager();
-
 foreach ($plugins as $plugin => $name) {
     $uninstall = '';
     if ($uninstallurl = core_plugin_manager::instance()->get_uninstall_url('report_'.$plugin, 'manage')) {
         $uninstall = html_writer::link($uninstallurl, $struninstall);
     }
 
-    $stores = $logmanager->get_supported_logstores('report_' . $plugin);
-    if ($stores === false) {
-        $supportedstores = get_string('logstorenotrequired', 'admin');
-    } else if (!empty($stores)) {
-        $supportedstores = implode(', ', $stores);
-    } else {
-        $supportedstores = get_string('nosupportedlogstore', 'admin');;
-    }
-
     if (!isset($versions[$plugin])) {
         if (file_exists("$CFG->dirroot/report/$plugin/version.php")) {
             // not installed yet
@@ -108,7 +96,7 @@ foreach ($plugins as $plugin => $name) {
         }
     }
 
-    $table->add_data(array($name, $supportedstores, $version, $uninstall));
+    $table->add_data(array($name, $version, $uninstall));
 }
 
 $table->print_html();

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

@@ -135,11 +135,6 @@ if ($roleid) {
     }
 }
 
-if (!empty($user) && ($user->id != $USER->id)) {
-    $PAGE->navigation->extend_for_user($user);
-    $PAGE->navbar->includesettingsbase = true;
-}
-
 $PAGE->set_pagelayout('admin');
 $PAGE->set_title($title);
 
@@ -181,7 +176,7 @@ if ($roleid) {
     // Show UI for assigning a particular role to users.
     // Print a warning if we are assigning system roles.
     if ($context->contextlevel == CONTEXT_SYSTEM) {
-        echo $OUTPUT->notification(get_string('globalroleswarning', 'core_role'));
+        echo $OUTPUT->box(get_string('globalroleswarning', 'core_role'));
     }
 
     // Print the form.
@@ -256,7 +251,7 @@ if ($roleid) {
 
     // Print a warning if we are assigning system roles.
     if ($context->contextlevel == CONTEXT_SYSTEM) {
-        echo $OUTPUT->notification(get_string('globalroleswarning', 'core_role'));
+        echo $OUTPUT->box(get_string('globalroleswarning', 'core_role'));
     }
 
     // Print instruction.

admin/roles/check.php

@@ -52,7 +52,6 @@ if (!has_any_capability(array('moodle/role:assign', 'moodle/role:safeoverride',
 $PAGE->set_url($url);
 
 if ($context->contextlevel == CONTEXT_USER and $USER->id != $context->instanceid) {
-    $PAGE->navbar->includesettingsbase = true;
     $PAGE->navigation->extend_for_user($user);
     $PAGE->set_context(context_course::instance($course->id));
 } else {

admin/roles/classes/capability_table_base.php

@@ -74,16 +74,8 @@ abstract class core_role_capability_table_base {
     public function display() {
         if (count($this->capabilities) > self::NUM_CAPS_FOR_SEARCH) {
             global $PAGE;
-            $jsmodule = array(
-                'name' => 'rolescapfilter',
-                'fullpath' => '/admin/roles/module.js',
-                'strings' => array(
-                    array('filter', 'moodle'),
-                    array('clear', 'moodle'),                ),
-                'requires' => array('node', 'cookie', 'escape')
-            );
-            $PAGE->requires->js_init_call('M.core_role.init_cap_table_filter', array($this->id, $this->context->id), false,
-                $jsmodule);
+            $PAGE->requires->strings_for_js(array('filter', 'clear'), 'moodle');
+            $PAGE->requires->js_init_call('M.core_role.init_cap_table_filter', array($this->id, $this->context->id));
         }
         echo '<table class="' . implode(' ', $this->classes) . '" id="' . $this->id . '">' . "\n<thead>\n";
         echo '<tr><th class="name" align="left" scope="col">' . get_string('capability', 'core_role') . '</th>';

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

@@ -75,8 +75,7 @@ switch ($action) {
             $a->id = $roleid;
             $a->name = $roles[$roleid]->name;
             $a->shortname = $roles[$roleid]->shortname;
-            $a->count = $DB->count_records_select('role_assignments',
-                'roleid = ?', array($roleid), 'COUNT(DISTINCT userid)');
+            $a->count = $DB->count_records('role_assignments', array('roleid'=>$roleid));
 
             $formcontinue = new single_button(new moodle_url($baseurl, $optionsyes), get_string('yes'));
             $formcancel = new single_button(new moodle_url($baseurl), get_string('no'), 'get');

admin/roles/module.js

@@ -51,11 +51,11 @@ M.core_role.init_cap_table_filter = function(Y, tableid, contextid) {
                 marginRight : 'auto'
             });
             // Create the capability search input.
-            this.input = Y.Node.create('<input type="text" id="'+this.table.get('id')+'capabilitysearch" value="'+Y.Escape.html(filtervalue)+'" />');
+            this.input = Y.Node.create('<input type="text" id="'+this.table.get('id')+'capabilitysearch" value="'+filtervalue+'" />');
             // Create a label for the search input.
-            this.label = Y.Node.create('<label for="'+this.input.get('id')+'">'+M.util.get_string('filter', 'moodle')+' </label>');
+            this.label = Y.Node.create('<label for="'+this.input.get('id')+'">'+M.str.moodle.filter+' </label>');
             // Create a clear button to clear the input.
-            this.button = Y.Node.create('<input type="button" value="'+M.util.get_string('clear', 'moodle')+'" />').set('disabled', filtervalue=='');
+            this.button = Y.Node.create('<input type="button" value="'+M.str.moodle.clear+'" />').set('disabled', filtervalue=='');
 
             // Tie it all together
             this.div.append(this.label).append(this.input).append(this.button);

admin/roles/override.php

@@ -139,6 +139,7 @@ if (optional_param('savechanges', false, PARAM_BOOL) && confirm_sesskey()) {
         array(
             'context' => $context,
             'objectid' => $roleid,
+            'courseid' => $courseid
         )
     );
 

admin/roles/permissions.php

@@ -59,9 +59,8 @@ require_capability('moodle/role:review', $context);
 $PAGE->set_url($url);
 
 if ($context->contextlevel == CONTEXT_USER and $USER->id != $context->instanceid) {
-    $PAGE->navbar->includesettingsbase = true;
     $PAGE->navigation->extend_for_user($user);
-    $PAGE->set_context(context_user::instance($user->id));
+    $PAGE->set_context(context_course::instance($course->id));
 } else {
     $PAGE->set_context($context);
 }

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'),
-        'grades,grades|/grade/report/mygrades.php|grades
-messages,message|/message/index.php|message
-preferences,moodle|/user/preferences.php|preferences',
-        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);
@@ -75,24 +64,11 @@ preferences,moodle|/user/preferences.php|preferences',
             6 => new lang_string('saturday', 'calendar')
         )));
     $temp->add(new admin_setting_special_calendar_weekend());
-    $options = array(365 => new lang_string('numyear', '', 1),
-            270 => new lang_string('nummonths', '', 9),
-            180 => new lang_string('nummonths', '', 6),
-            150 => new lang_string('nummonths', '', 5),
-            120 => new lang_string('nummonths', '', 4),
-            90  => new lang_string('nummonths', '', 3),
-            60  => new lang_string('nummonths', '', 2),
-            30  => new lang_string('nummonth', '', 1),
-            21  => new lang_string('numweeks', '', 3),
-            14  => new lang_string('numweeks', '', 2),
-            7  => new lang_string('numweek', '', 1),
-            6  => new lang_string('numdays', '', 6),
-            5  => new lang_string('numdays', '', 5),
-            4  => new lang_string('numdays', '', 4),
-            3  => new lang_string('numdays', '', 3),
-            2  => new lang_string('numdays', '', 2),
-            1  => new lang_string('numday', '', 1));
-    $temp->add(new admin_setting_configselect('calendar_lookahead', new lang_string('configlookahead', 'admin'), new lang_string('helpupcominglookahead', 'admin'), 21, $options));
+    $options = array();
+    for ($i=1; $i<=99; $i++) {
+        $options[$i] = $i;
+    }
+    $temp->add(new admin_setting_configselect('calendar_lookahead',new lang_string('configlookahead','admin'),new lang_string('helpupcominglookahead', 'admin'),21,$options));
     $options = array();
     for ($i=1; $i<=20; $i++) {
         $options[$i] = $i;
@@ -140,14 +116,12 @@ preferences,moodle|/user/preferences.php|preferences',
         HOMEPAGE_MY => new lang_string('mymoodle', 'admin'),
         HOMEPAGE_USER => new lang_string('userpreference', 'admin')
     );
-    $temp->add(new admin_setting_configselect('defaulthomepage', new lang_string('defaulthomepage', 'admin'),
-            new lang_string('configdefaulthomepage', 'admin'), HOMEPAGE_MY, $choices));
+    $temp->add(new admin_setting_configselect('defaulthomepage', new lang_string('defaulthomepage', 'admin'), new lang_string('configdefaulthomepage', 'admin'), HOMEPAGE_SITE, $choices));
     $temp->add(new admin_setting_configcheckbox('allowguestmymoodle', new lang_string('allowguestmymoodle', 'admin'), new lang_string('configallowguestmymoodle', 'admin'), 1));
     $temp->add(new admin_setting_configcheckbox('navshowfullcoursenames', new lang_string('navshowfullcoursenames', 'admin'), new lang_string('navshowfullcoursenames_help', 'admin'), 0));
     $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'),
@@ -158,7 +132,6 @@ preferences,moodle|/user/preferences.php|preferences',
     $temp->add(new admin_setting_configtext('navcourselimit',new lang_string('navcourselimit','admin'),new lang_string('confignavcourselimit', 'admin'),20,PARAM_INT));
     $temp->add(new admin_setting_configcheckbox('usesitenameforsitepages', new lang_string('usesitenameforsitepages', 'admin'), new lang_string('configusesitenameforsitepages', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('linkadmincategories', new lang_string('linkadmincategories', 'admin'), new lang_string('linkadmincategories_help', 'admin'), 0));
-    $temp->add(new admin_setting_configcheckbox('linkcoursesections', new lang_string('linkcoursesections', 'admin'), new lang_string('linkcoursesections_help', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('navshowfrontpagemods', new lang_string('navshowfrontpagemods', 'admin'), new lang_string('navshowfrontpagemods_help', 'admin'), 1));
     $temp->add(new admin_setting_configcheckbox('navadduserpostslinks', new lang_string('navadduserpostslinks', 'admin'), new lang_string('navadduserpostslinks_help', 'admin'), 1));
 
@@ -218,9 +191,6 @@ preferences,moodle|/user/preferences.php|preferences',
     // "documentation" settingpage
     $temp = new admin_settingpage('documentation', new lang_string('moodledocs'));
     $temp->add(new admin_setting_configtext('docroot', new lang_string('docroot', 'admin'), new lang_string('configdocroot', 'admin'), 'http://docs.moodle.org', PARAM_URL));
-    $ltemp = array('' => get_string('forceno'));
-    $ltemp += get_string_manager()->get_list_of_translations(true);
-    $temp->add(new admin_setting_configselect('doclang', get_string('doclang', 'admin'), get_string('configdoclang', 'admin'), '', $ltemp));
     $temp->add(new admin_setting_configcheckbox('doctonewwindow', new lang_string('doctonewwindow', 'admin'), new lang_string('configdoctonewwindow', 'admin'), 0));
     $ADMIN->add('appearance', $temp);
 
@@ -247,6 +217,7 @@ preferences,moodle|/user/preferences.php|preferences',
     $ADMIN->add('appearance', $temp);
 
     $temp = new admin_settingpage('ajax', new lang_string('ajaxuse'));
+    $temp->add(new admin_setting_configcheckbox('enableajax', new lang_string('enableajax', 'admin'), new lang_string('configenableajax', 'admin'), 1));
     $temp->add(new admin_setting_configcheckbox('useexternalyui', new lang_string('useexternalyui', 'admin'), new lang_string('configuseexternalyui', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('yuicomboloading', new lang_string('yuicomboloading', 'admin'), new lang_string('configyuicomboloading', 'admin'), 1));
     $setting = new admin_setting_configcheckbox('cachejs', new lang_string('cachejs', 'admin'), new lang_string('cachejs_help', 'admin'), 1);

admin/settings/courses.php

@@ -26,8 +26,7 @@ $capabilities = array(
     'moodle/backup:backupcourse',
     'moodle/category:manage',
     'moodle/course:create',
-    'moodle/site:approvecourse',
-    'moodle/restore:restorecourse'
+    'moodle/site:approvecourse'
 );
 if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
     // Speedup for non-admins, add all caps used on this page.
@@ -43,12 +42,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
             array('moodle/category:manage')
         )
     );
-    $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')
-        )
-    );
 
     // Course Default Settings Page.
     // NOTE: these settings must be applied after all other settings because they depend on them.
@@ -196,10 +189,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
     $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_logs', new lang_string('generallogs','backup'), new lang_string('configgenerallogs','backup'), array('value'=>0, 'locked'=>0)));
     $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_histories', new lang_string('generalhistories','backup'), new lang_string('configgeneralhistories','backup'), array('value'=>0, 'locked'=>0)));
     $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_questionbank', new lang_string('generalquestionbank','backup'), new lang_string('configgeneralquestionbank','backup'), array('value'=>1, 'locked'=>0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_groups',
-            new lang_string('generalgroups', 'backup'), new lang_string('configgeneralgroups', 'backup'),
-            array('value' => 1, 'locked' => 0)));
-
     $ADMIN->add('backups', $temp);
 
     // Create a page for general import configuration and defaults.
@@ -225,7 +214,7 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
         2 => new lang_string('storagecourseandexternal', 'backup')
     );
     $temp->add(new admin_setting_configselect('backup/backup_auto_storage', new lang_string('automatedstorage', 'backup'), new lang_string('automatedstoragehelp', 'backup'), 0, $storageoptions));
-    $temp->add(new admin_setting_special_backup_auto_destination());
+    $temp->add(new admin_setting_configdirectory('backup/backup_auto_destination', new lang_string('saveto'), new lang_string('backupsavetohelp'), ''));
     $keepoptoins = array(
         0 => new lang_string('all'), 1 => '1',
         2 => '2',
@@ -275,8 +264,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_logs', new lang_string('generallogs', 'backup'), new lang_string('configgenerallogs', 'backup'), 0));
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_histories', new lang_string('generalhistories','backup'), new lang_string('configgeneralhistories','backup'), 0));
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_questionbank', new lang_string('generalquestionbank','backup'), new lang_string('configgeneralquestionbank','backup'), 1));
-    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_groups', new lang_string('generalgroups', 'backup'),
-            new lang_string('configgeneralgroups', 'backup'), 1));
 
     //$temp->add(new admin_setting_configcheckbox('backup/backup_auto_messages', new lang_string('messages', 'message'), new lang_string('backupmessageshelp','message'), 0));
     //$temp->add(new admin_setting_configcheckbox('backup/backup_auto_blogs', new lang_string('blogs', 'blog'), new lang_string('backupblogshelp','blog'), 0));

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.
@@ -18,6 +19,18 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $enablecssoptimiser->set_updatedcallback('theme_reset_all_caches');
     $temp->add($enablecssoptimiser);
 
+    // Backup archive .mbz format: switching to .tar.gz enables larger files, better
+    // progress reporting and possibly better performance. This is an experimental
+    // setting but if successful, should be removed and enabled by default in a future
+    // version. Note: this setting controls newly-created backups only; restore always
+    // supports both formats.
+    $temp->add(new admin_setting_configcheckbox('enabletgzbackups',
+            new lang_string('enabletgzbackups', 'admin'),
+            new lang_string('enabletgzbackups_desc', 'admin'), 0));
+    $temp->add(new admin_setting_php_extension_enabled('zlibenabled',
+            get_string('zlibenabled', 'admin'),
+            get_string('enabletgzbackups_nozlib', 'admin'), 'zlib'));
+
     $ADMIN->add('experimental', $temp);
 
     // "debugging" settingpage
@@ -31,46 +44,48 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $temp->add(new admin_setting_configcheckbox('debugpageinfo', new lang_string('debugpageinfo', 'admin'), new lang_string('configdebugpageinfo', 'admin'), 0));
     $ADMIN->add('development', $temp);
 
-    // "Profiling" settingpage (conditionally if the 'xhprof' extension is available only).
-    $xhprofenabled = extension_loaded('xhprof') && function_exists('xhprof_enable');
-    $temp = new admin_settingpage('profiling', new lang_string('profiling', 'admin'), 'moodle/site:config', !$xhprofenabled);
-    // Main profiling switch.
-    $temp->add(new admin_setting_configcheckbox('profilingenabled', new lang_string('profilingenabled', 'admin'), new lang_string('profilingenabled_help', 'admin'), false));
-    // List of URLs that will be automatically profiled.
-    $temp->add(new admin_setting_configtextarea('profilingincluded', new lang_string('profilingincluded', 'admin'), new lang_string('profilingincluded_help', 'admin'), ''));
-    // List of URLs that won't be profiled ever.
-    $temp->add(new admin_setting_configtextarea('profilingexcluded', new lang_string('profilingexcluded', 'admin'), new lang_string('profilingexcluded_help', 'admin'), ''));
-    // Allow random profiling each XX requests.
-    $temp->add(new admin_setting_configtext('profilingautofrec', new lang_string('profilingautofrec', 'admin'), new lang_string('profilingautofrec_help', 'admin'), 0, PARAM_INT));
-    // Allow PROFILEME/DONTPROFILEME GPC.
-    $temp->add(new admin_setting_configcheckbox('profilingallowme', new lang_string('profilingallowme', 'admin'), new lang_string('profilingallowme_help', 'admin'), false));
-    // Allow PROFILEALL/PROFILEALLSTOP GPC.
-    $temp->add(new admin_setting_configcheckbox('profilingallowall', new lang_string('profilingallowall', 'admin'), new lang_string('profilingallowall_help', 'admin'), false));
-    // TODO: Allow to skip PHP functions (XHPROF_FLAGS_NO_BUILTINS)
-    // TODO: Allow to skip call_user functions (ignored_functions array)
-    // Specify the life time (in minutes) of profiling runs.
-    $temp->add(new admin_setting_configselect('profilinglifetime', new lang_string('profilinglifetime', 'admin'), new lang_string('profilinglifetime_help', 'admin'), 24*60, array(
-               0 => new lang_string('neverdeleteruns', 'admin'),
-        30*24*60 => new lang_string('numdays', '', 30),
-        15*24*60 => new lang_string('numdays', '', 15),
-         7*24*60 => new lang_string('numdays', '', 7),
-         4*24*60 => new lang_string('numdays', '', 4),
-         2*24*60 => new lang_string('numdays', '', 2),
-           24*60 => new lang_string('numhours', '', 24),
-           16*80 => new lang_string('numhours', '', 16),
-            8*60 => new lang_string('numhours', '', 8),
-            4*60 => new lang_string('numhours', '', 4),
-            2*60 => new lang_string('numhours', '', 2),
-              60 => new lang_string('numminutes', '', 60),
-              30 => new lang_string('numminutes', '', 30),
-              15 => new lang_string('numminutes', '', 15))));
-    // Define the prefix to be added to imported profiling runs.
-    $temp->add(new admin_setting_configtext('profilingimportprefix',
-            new lang_string('profilingimportprefix', 'admin'),
-            new lang_string('profilingimportprefix_desc', 'admin'), '(I)', PARAM_TAG, 10));
+    // "profiling" settingpage (conditionally if the 'xhprof' extension is available only)
+    if (extension_loaded('xhprof') && function_exists('xhprof_enable')) {
+        $temp = new admin_settingpage('profiling', new lang_string('profiling', 'admin'));
+        // Main profiling switch
+        $temp->add(new admin_setting_configcheckbox('profilingenabled', new lang_string('profilingenabled', 'admin'), new lang_string('profilingenabled_help', 'admin'), false));
+        // List of URLs that will be automatically profiled
+        $temp->add(new admin_setting_configtextarea('profilingincluded', new lang_string('profilingincluded', 'admin'), new lang_string('profilingincluded_help', 'admin'), ''));
+        // List of URLs that won't be profiled ever
+        $temp->add(new admin_setting_configtextarea('profilingexcluded', new lang_string('profilingexcluded', 'admin'), new lang_string('profilingexcluded_help', 'admin'), ''));
+        // Allow random profiling each XX requests
+        $temp->add(new admin_setting_configtext('profilingautofrec', new lang_string('profilingautofrec', 'admin'), new lang_string('profilingautofrec_help', 'admin'), 0, PARAM_INT));
+        // Allow PROFILEME/DONTPROFILEME GPC
+        $temp->add(new admin_setting_configcheckbox('profilingallowme', new lang_string('profilingallowme', 'admin'), new lang_string('profilingallowme_help', 'admin'), false));
+        // Allow PROFILEALL/PROFILEALLSTOP GPC
+        $temp->add(new admin_setting_configcheckbox('profilingallowall', new lang_string('profilingallowall', 'admin'), new lang_string('profilingallowall_help', 'admin'), false));
+        // TODO: Allow to skip PHP functions (XHPROF_FLAGS_NO_BUILTINS)
+        // TODO: Allow to skip call_user functions (ignored_functions array)
+        // Specify the life time (in minutes) of profiling runs
+        $temp->add(new admin_setting_configselect('profilinglifetime', new lang_string('profilinglifetime', 'admin'), new lang_string('profilinglifetime_help', 'admin'), 24*60, array(
+             0 => new lang_string('neverdeleteruns', 'admin'),
+      30*24*60 => new lang_string('numdays', '', 30),
+      15*24*60 => new lang_string('numdays', '', 15),
+       7*24*60 => new lang_string('numdays', '', 7),
+       4*24*60 => new lang_string('numdays', '', 4),
+       2*24*60 => new lang_string('numdays', '', 2),
+         24*60 => new lang_string('numhours', '', 24),
+         16*80 => new lang_string('numhours', '', 16),
+          8*60 => new lang_string('numhours', '', 8),
+          4*60 => new lang_string('numhours', '', 4),
+          2*60 => new lang_string('numhours', '', 2),
+            60 => new lang_string('numminutes', '', 60),
+            30 => new lang_string('numminutes', '', 30),
+            15 => new lang_string('numminutes', '', 15))));
+        // Define the prefix to be added to imported profiling runs.
+        $temp->add(new admin_setting_configtext('profilingimportprefix',
+                new lang_string('profilingimportprefix', 'admin'),
+                new lang_string('profilingimportprefix_desc', 'admin'), '(I)', PARAM_TAG, 10));
+
+        // Add the 'profiling' page to admin block
+        $ADMIN->add('development', $temp);
+    }
 
-    // Add the 'profiling' page to admin block.
-    $ADMIN->add('development', $temp);
 
      // Web service test clients DO NOT COMMIT : THE EXTERNAL WEB PAGE IS NOT AN ADMIN PAGE !!!!!
     $ADMIN->add('development', new admin_externalpage('testclient', new lang_string('testclient', 'webservice'), "$CFG->wwwroot/$CFG->admin/webservice/testclient.php"));

admin/settings/grades.php

@@ -67,21 +67,6 @@ if (has_capability('moodle/grade:manage', $systemcontext)
         $temp->add(new admin_setting_special_gradeexport());
 
         $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());
-
-        $temp->add(new admin_setting_my_grades_report());
-
-        $temp->add(new admin_setting_configtext('gradereport_mygradeurl', new lang_string('externalurl', 'grades'),
-                new lang_string('externalurl_desc', 'grades'), ''));
     }
     $ADMIN->add('grades', $temp);
 
@@ -103,9 +88,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'),
@@ -119,6 +106,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++) {
@@ -132,9 +121,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/location.php

@@ -4,8 +4,11 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
 
     // "locations" settingpage
     $temp = new admin_settingpage('locationsettings', new lang_string('locationsettings', 'admin'));
-    $temp->add(new admin_setting_servertimezone());
-    $temp->add(new admin_setting_forcetimezone());
+    $options = get_list_of_timezones();
+    $options[99] = new lang_string('serverlocaltime');
+    $temp->add(new admin_setting_configselect('timezone', new lang_string('timezone','admin'), new lang_string('configtimezone', 'admin'), 99, $options));
+    $options[99] = new lang_string('timezonenotforced', 'admin');
+    $temp->add(new admin_setting_configselect('forcetimezone', new lang_string('forcetimezone', 'admin'), new lang_string('helpforcetimezone', 'admin'), 99, $options));
     $temp->add(new admin_settings_country_select('country', new lang_string('country', 'admin'), new lang_string('configcountry', 'admin'), 0));
     $temp->add(new admin_setting_configtext('defaultcity', new lang_string('defaultcity', 'admin'), new lang_string('defaultcity_help', 'admin'), ''));
 

admin/settings/plugins.php

@@ -25,20 +25,10 @@
 */
 
 if ($hassiteconfig) {
-    /* @var admin_root $ADMIN */
-    $ADMIN->locate('modules')->set_sorting(true);
-
     $ADMIN->add('modules', new admin_page_pluginsoverview());
 
     // activity modules
     $ADMIN->add('modules', new admin_category('modsettings', new lang_string('activitymodules')));
-
-    $temp = new admin_settingpage('managemodulescommon', new lang_string('commonsettings', 'admin'));
-
-    $temp->add(new admin_setting_configcheckbox('requiremodintro',
-        get_string('requiremodintro', 'admin'), get_string('requiremodintro_desc', 'admin'), 0));
-    $ADMIN->add('modsettings', $temp);
-
     $ADMIN->add('modsettings', new admin_page_managemods());
     foreach (core_plugin_manager::instance()->get_plugins_of_type('mod') as $plugin) {
         /** @var \core\plugininfo\mod $plugin */
@@ -79,15 +69,10 @@ if ($hassiteconfig) {
     $temp->add(new admin_setting_manageauths());
     $temp->add(new admin_setting_heading('manageauthscommonheading', new lang_string('commonsettings', 'admin'), ''));
     $temp->add(new admin_setting_special_registerauth());
-    $temp->add(new admin_setting_configcheckbox('authloginviaemail', new lang_string('authloginviaemail', 'core_auth'), new lang_string('authloginviaemail_desc', 'core_auth'), 0));
     $temp->add(new admin_setting_configcheckbox('authpreventaccountcreation', new lang_string('authpreventaccountcreation', 'admin'), new lang_string('authpreventaccountcreation_help', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('loginpageautofocus', new lang_string('loginpageautofocus', 'admin'), new lang_string('loginpageautofocus_help', 'admin'), 0));
     $temp->add(new admin_setting_configselect('guestloginbutton', new lang_string('guestloginbutton', 'auth'),
                                               new lang_string('showguestlogin', 'auth'), '1', array('0'=>new lang_string('hide'), '1'=>new lang_string('show'))));
-    $options = array(0 => get_string('no'), 1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 10 => 10, 20 => 20, 50 => 50);
-    $temp->add(new admin_setting_configselect('limitconcurrentlogins',
-        new lang_string('limitconcurrentlogins', 'core_auth'),
-        new lang_string('limitconcurrentlogins_desc', 'core_auth'), 0, $options));
     $temp->add(new admin_setting_configtext('alternateloginurl', new lang_string('alternateloginurl', 'auth'),
                                             new lang_string('alternatelogin', 'auth', htmlspecialchars(get_login_url())), ''));
     $temp->add(new admin_setting_configtext('forgottenpasswordurl', new lang_string('forgottenpasswordurl', 'auth'),
@@ -157,7 +142,31 @@ if ($hassiteconfig) {
     // "filtersettings" settingpage
     $temp = new admin_settingpage('commonfiltersettings', new lang_string('commonfiltersettings', 'admin'));
     if ($ADMIN->fulltree) {
+        $cachetimes = array(
+            604800 => new lang_string('numdays','',7),
+            86400 => new lang_string('numdays','',1),
+            43200 => new lang_string('numhours','',12),
+            10800 => new lang_string('numhours','',3),
+            7200 => new lang_string('numhours','',2),
+            3600 => new lang_string('numhours','',1),
+            2700 => new lang_string('numminutes','',45),
+            1800 => new lang_string('numminutes','',30),
+            900 => new lang_string('numminutes','',15),
+            600 => new lang_string('numminutes','',10),
+            540 => new lang_string('numminutes','',9),
+            480 => new lang_string('numminutes','',8),
+            420 => new lang_string('numminutes','',7),
+            360 => new lang_string('numminutes','',6),
+            300 => new lang_string('numminutes','',5),
+            240 => new lang_string('numminutes','',4),
+            180 => new lang_string('numminutes','',3),
+            120 => new lang_string('numminutes','',2),
+            60 => new lang_string('numminutes','',1),
+            30 => new lang_string('numseconds','',30),
+            0 => new lang_string('no')
+        );
         $items = array();
+        $items[] = new admin_setting_configselect('cachetext', new lang_string('cachetext', 'admin'), new lang_string('configcachetext', 'admin'), 60, $cachetimes);
         $items[] = new admin_setting_configselect('filteruploadedfiles', new lang_string('filteruploadedfiles', 'admin'), new lang_string('configfilteruploadedfiles', 'admin'), 0,
                 array('0' => new lang_string('none'), '1' => new lang_string('allfiles'), '2' => new lang_string('htmlfilesonly')));
         $items[] = new admin_setting_configcheckbox('filtermatchoneperpage', new lang_string('filtermatchoneperpage', 'admin'), new lang_string('configfiltermatchoneperpage', 'admin'), 0);
@@ -247,10 +256,7 @@ if ($hassiteconfig) {
 
     // Add common settings page
     $temp = new admin_settingpage('managerepositoriescommon', new lang_string('commonrepositorysettings', 'repository'));
-    $temp->add(new admin_setting_configtext('repositorycacheexpire', new lang_string('cacheexpire', 'repository'), new lang_string('configcacheexpire', 'repository'), 120, PARAM_INT));
-    $temp->add(new admin_setting_configtext('repositorygetfiletimeout', new lang_string('getfiletimeout', 'repository'), new lang_string('configgetfiletimeout', 'repository'), 30, PARAM_INT));
-    $temp->add(new admin_setting_configtext('repositorysyncfiletimeout', new lang_string('syncfiletimeout', 'repository'), new lang_string('configsyncfiletimeout', 'repository'), 1, PARAM_INT));
-    $temp->add(new admin_setting_configtext('repositorysyncimagetimeout', new lang_string('syncimagetimeout', 'repository'), new lang_string('configsyncimagetimeout', 'repository'), 3, PARAM_INT));
+    $temp->add(new admin_setting_configtext('repositorycacheexpire', new lang_string('cacheexpire', 'repository'), new lang_string('configcacheexpire', 'repository'), 120));
     $temp->add(new admin_setting_configcheckbox('repositoryallowexternallinks', new lang_string('allowexternallinks', 'repository'), new lang_string('configallowexternallinks', 'repository'), 1));
     $temp->add(new admin_setting_configcheckbox('legacyfilesinnewcourses', new lang_string('legacyfilesinnewcourses', 'admin'), new lang_string('legacyfilesinnewcourses_help', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('legacyfilesaddallowed', new lang_string('legacyfilesaddallowed', 'admin'), new lang_string('legacyfilesaddallowed_help', 'admin'), 1));
@@ -289,6 +295,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);
@@ -366,7 +375,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

@@ -55,8 +55,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
 
     $temp->add(new admin_setting_configcheckbox('profilesforenrolledusersonly', new lang_string('profilesforenrolledusersonly','admin'),new lang_string('configprofilesforenrolledusersonly', 'admin'),'1'));
 
-    $temp->add(new admin_setting_configcheckbox('cronclionly', new lang_string('cronclionly', 'admin'), new lang_string
-            ('configcronclionly', 'admin'), 1));
+    $temp->add(new admin_setting_configcheckbox('cronclionly', new lang_string('cronclionly', 'admin'), new lang_string('configcronclionly', 'admin'), 0));
     $temp->add(new admin_setting_configpasswordunmask('cronremotepassword', new lang_string('cronremotepassword', 'admin'), new lang_string('configcronremotepassword', 'admin'), ''));
 
     $options = array(0=>get_string('no'), 3=>3, 5=>5, 7=>7, 10=>10, 20=>20, 30=>30, 50=>50, 100=>100);
@@ -71,11 +70,6 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $temp->add(new admin_setting_configtext('minpasswordupper', new lang_string('minpasswordupper', 'admin'), new lang_string('configminpasswordupper', 'admin'), 1, PARAM_INT));
     $temp->add(new admin_setting_configtext('minpasswordnonalphanum', new lang_string('minpasswordnonalphanum', 'admin'), new lang_string('configminpasswordnonalphanum', 'admin'), 1, PARAM_INT));
     $temp->add(new admin_setting_configtext('maxconsecutiveidentchars', new lang_string('maxconsecutiveidentchars', 'admin'), new lang_string('configmaxconsecutiveidentchars', 'admin'), 0, PARAM_INT));
-
-    $temp->add(new admin_setting_configtext('passwordreuselimit',
-        new lang_string('passwordreuselimit', 'admin'),
-        new lang_string('passwordreuselimit_desc', 'admin'), 0, PARAM_INT));
-
     $pwresetoptions = array(
         300 => new lang_string('numminutes', '', 5),
         900 => new lang_string('numminutes', '', 15),
@@ -92,9 +86,6 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
             1800,
             $pwresetoptions);
     $temp->add($adminsetting);
-    $temp->add(new admin_setting_configcheckbox('passwordchangelogout',
-        new lang_string('passwordchangelogout', 'admin'),
-        new lang_string('passwordchangelogout_desc', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('groupenrolmentkeypolicy', new lang_string('groupenrolmentkeypolicy', 'admin'), new lang_string('groupenrolmentkeypolicy_desc', 'admin'), 1));
     $temp->add(new admin_setting_configcheckbox('disableuserimages', new lang_string('disableuserimages', 'admin'), new lang_string('configdisableuserimages', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('emailchangeconfirmation', new lang_string('emailchangeconfirmation', 'admin'), new lang_string('configemailchangeconfirmation', 'admin'), 1));
@@ -117,8 +108,10 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
 
     // "notifications" settingpage
     $temp = new admin_settingpage('notifications', new lang_string('notifications', 'admin'));
-    $temp->add(new admin_setting_configcheckbox('displayloginfailures', new lang_string('displayloginfailures', 'admin'),
-            new lang_string('configdisplayloginfailures', 'admin'), 0));
+    $temp->add(new admin_setting_configselect('displayloginfailures', new lang_string('displayloginfailures', 'admin'), new lang_string('configdisplayloginfailures', 'admin'), '', array('' => new lang_string('nobody'),
+                                                                                                                                                                                'admin' => new lang_string('administrators'),
+                                                                                                                                                                                'teacher' => new lang_string('administratorsandteachers'),
+                                                                                                                                                                                'everybody' => new lang_string('everybody'))));
     $temp->add(new admin_setting_users_with_capability('notifyloginfailures', new lang_string('notifyloginfailures', 'admin'), new lang_string('confignotifyloginfailures', 'admin'), array(), 'moodle/site:config'));
     $options = array();
     for ($i = 1; $i <= 100; $i++) {

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);
 
 
@@ -94,7 +93,6 @@ $options = array(
     GETREMOTEADDR_SKIP_HTTP_X_FORWARDED_FOR => 'HTTP_CLIENT, REMOTE_ADDR',
     GETREMOTEADDR_SKIP_HTTP_X_FORWARDED_FOR|GETREMOTEADDR_SKIP_HTTP_CLIENT_IP => 'REMOTE_ADDR');
 $temp->add(new admin_setting_configselect('getremoteaddrconf', new lang_string('getremoteaddrconf', 'admin'), new lang_string('configgetremoteaddrconf', 'admin'), 0, $options));
-
 $temp->add(new admin_setting_heading('webproxy', new lang_string('webproxy', 'admin'), new lang_string('webproxyinfo', 'admin')));
 $temp->add(new admin_setting_configtext('proxyhost', new lang_string('proxyhost', 'admin'), new lang_string('configproxyhost', 'admin'), '', PARAM_HOST));
 $temp->add(new admin_setting_configtext('proxyport', new lang_string('proxyport', 'admin'), new lang_string('configproxyport', 'admin'), 0, PARAM_INT));
@@ -138,6 +136,21 @@ $temp->add(new admin_setting_configselect('deleteincompleteusers', new lang_stri
                                                                                                                                                                     48 => new lang_string('numdays', '', 2),
                                                                                                                                                                     24 => new lang_string('numdays', '', 1))));
 
+$temp->add(new admin_setting_configcheckbox('logguests', new lang_string('logguests', 'admin'),
+                                            new lang_string('logguests_help', 'admin'), 1));
+$temp->add(new admin_setting_configselect('loglifetime', new lang_string('loglifetime', 'admin'), new lang_string('configloglifetime', 'admin'), 0, array(0 => new lang_string('neverdeletelogs'),
+                                                                                                                                                1000 => new lang_string('numdays', '', 1000),
+                                                                                                                                                365 => new lang_string('numdays', '', 365),
+                                                                                                                                                180 => new lang_string('numdays', '', 180),
+                                                                                                                                                150 => new lang_string('numdays', '', 150),
+                                                                                                                                                120 => new lang_string('numdays', '', 120),
+                                                                                                                                                90 => new lang_string('numdays', '', 90),
+                                                                                                                                                60 => new lang_string('numdays', '', 60),
+                                                                                                                                                35 => new lang_string('numdays', '', 35),
+                                                                                                                                                10 => new lang_string('numdays', '', 10),
+                                                                                                                                                5 => new lang_string('numdays', '', 5),
+                                                                                                                                                2 => new lang_string('numdays', '', 2))));
+
 
 $temp->add(new admin_setting_configcheckbox('disablegradehistory', new lang_string('disablegradehistory', 'grades'),
                                             new lang_string('disablegradehistory_help', 'grades'), 0));
@@ -153,19 +166,6 @@ $temp->add(new admin_setting_configselect('gradehistorylifetime', new lang_strin
                                                                                                      60 => new lang_string('numdays', '', 60),
                                                                                                      30 => new lang_string('numdays', '', 30))));
 
-$temp->add(new admin_setting_configselect('tempdatafoldercleanup', new lang_string('tempdatafoldercleanup', 'admin'),
-        new lang_string('configtempdatafoldercleanup', 'admin'), 168, array(
-            1 => new lang_string('numhours', '', 1),
-            3 => new lang_string('numhours', '', 3),
-            6 => new lang_string('numhours', '', 6),
-            9 => new lang_string('numhours', '', 9),
-            12 => new lang_string('numhours', '', 12),
-            18 => new lang_string('numhours', '', 18),
-            24 => new lang_string('numhours', '', 24),
-            48 => new lang_string('numdays', '', 2),
-            168 => new lang_string('numdays', '', 7),
-)));
-
 $ADMIN->add('server', $temp);
 
 
@@ -195,8 +195,6 @@ if (PHP_INT_SIZE === 8) {
 $temp->add(new admin_setting_configselect('extramemorylimit', new lang_string('extramemorylimit', 'admin'),
                                           new lang_string('configextramemorylimit', 'admin'), '512M',
                                           $memoryoptions));
-$temp->add(new admin_setting_configtext('maxtimelimit', new lang_string('maxtimelimit', 'admin'),
-        new lang_string('maxtimelimit_desc', 'admin'), 0, PARAM_INT));
 
 $temp->add(new admin_setting_configtext('curlcache', new lang_string('curlcache', 'admin'),
                                         new lang_string('configcurlcache', 'admin'), 120, PARAM_INT));

admin/settings/subsystems.php

@@ -44,8 +44,8 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
             new lang_string('configcompletiondefault', 'completion'), 1, $options));
 
     $optionalsubsystems->add($checkbox = new admin_setting_configcheckbox('enableavailability',
-            new lang_string('enableavailability', 'availability'),
-            new lang_string('enableavailability_desc', 'availability'), 0));
+        new lang_string('enableavailability','condition'),
+        new lang_string('configenableavailability','condition'), 0));
     $checkbox->set_affects_modinfo(true);
 
     $optionalsubsystems->add(new admin_setting_configcheckbox('enableplagiarism', new lang_string('enableplagiarism','plagiarism'), new lang_string('configenableplagiarism','plagiarism'), 0));

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')));
 
@@ -157,7 +119,6 @@ if ($hassiteconfig
                        array('description' => new lang_string('description'),
                              'city' => new lang_string('city'),
                              'country' => new lang_string('country'),
-                             'timezone' => new lang_string('timezone'),
                              'webpage' => new lang_string('webpage'),
                              'icqnumber' => new lang_string('icqnumber'),
                              'skypeid' => new lang_string('skypeid'),
@@ -166,7 +127,6 @@ if ($hassiteconfig
                              'msnid' => new lang_string('msnid'),
                              'firstaccess' => new lang_string('firstaccess'),
                              'lastaccess' => new lang_string('lastaccess'),
-                             'lastip' => new lang_string('lastip'),
                              'mycourses' => new lang_string('mycourses'),
                              'groups' => new lang_string('groups'),
                              'suspended' => new lang_string('suspended', 'auth'),
@@ -191,9 +151,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

@@ -80,8 +80,7 @@ class behat_admin extends behat_base {
             // Single element settings.
             try {
                 $fieldxpath = "//*[self::input | self::textarea | self::select][not(./@type = 'submit' or ./@type = 'image' or ./@type = 'hidden')]" .
-                    "[@id=//label[contains(normalize-space(.), $label)]/@for or " .
-                    "@id=//span[contains(normalize-space(.), $label)]/preceding-sibling::label[1]/@for]";
+                    "[@id=//label[contains(normalize-space(.), $label)]/@for]";
                 $fieldnode = $this->find('xpath', $fieldxpath, $exception);
 
                 $formfieldtypenode = $this->find('xpath', $fieldxpath . "/ancestor::div[@class='form-setting']" .
@@ -90,7 +89,7 @@ class behat_admin extends behat_base {
             } catch (ElementNotFoundException $e) {
 
                 // Multi element settings, interacting only the first one.
-                $fieldxpath = "//*[label[.= $label]|span[.= $label]]/ancestor::div[contains(concat(' ', normalize-space(@class), ' '), ' form-item ')]" .
+                $fieldxpath = "//descendant::label[.= $label]/ancestor::div[contains(concat(' ', normalize-space(@class), ' '), ' form-item ')]" .
                     "/descendant::div[@class='form-group']/descendant::*[self::input | self::textarea | self::select][not(./@type = 'submit' or ./@type = 'image' or ./@type = 'hidden')]";
                 $fieldnode = $this->find('xpath', $fieldxpath);
 
@@ -114,30 +113,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.
      *
@@ -150,4 +125,17 @@ class behat_admin extends behat_base {
             $this->getSession()->wait($timeout, $javascript);
         }
     }
+
+    /**
+     * Will be deprecated in 2.7. Goes to notification page.
+     *
+     * @Given /^I go to notifications page$/
+     * @return Given[]
+     */
+    public function i_go_to_notifications_page() {
+        return array(
+            new Given('I expand "' . get_string('administrationsite') . '" node'),
+            new Given('I follow "' . get_string('notifications') . '"')
+        );
+    }
 }

admin/tests/behat/display_short_names.feature

@@ -5,11 +5,10 @@ Feature: Display extended course names
   I need to display courses short names along with courses full names
 
   Background:
-    Given the following "courses" exist:
+    Given the following "courses" exists:
       | fullname | shortname | category |
       | Course fullname | C_shortname | 0 |
     And I log in as "admin"
-    And I am on site homepage
 
   Scenario: Courses list without extended course names (default value)
     Then I should see "Course fullname"
@@ -18,7 +17,7 @@ Feature: Display extended course names
   Scenario: Courses list with extended course names
     Given I expand "Site administration" node
     And I click on "Courses" "link" in the "//div[@id='settingsnav']/descendant::li[contains(concat(' ', normalize-space(@class), ' '), ' type_setting ')][contains(., 'Appearance')]" "xpath_element"
-    And I set the field "Display extended course names" to "1"
+    And I check "Display extended course names"
     When I press "Save changes"
-    And I am on site homepage
+    And I am on homepage
     Then I should see "C_shortname Course fullname"

admin/tests/behat/filter_users.feature

@@ -5,31 +5,31 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
   I need to filter the users account list using different filter
 
   Background:
-    Given the following "users" exist:
+    Given the following "users" exists:
       | 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 |
-    And the following "cohorts" exist:
+      | user1 | User | One | one@asd.com | manual | 0 |
+      | user2 | User | Two | one@asd.com | ldap | 1 |
+      | user3 | User | Three | one@asd.com | manual | 1 |
+      | user4 | User | Four | one@asd.com | ldap | 0 |
+    And the following "cohorts" exists:
       | name | idnumber |
       | Cohort 1 | CH1 |
-    And the following "courses" exist:
+    And the following "courses" exists:
       | fullname | shortname | category |
       | Course 1 | C1 | 0 |
-    And the following "course enrolments" exist:
+    And the following "course enrolments" exists:
       | user | course | role |
       | user1 | C1 | student |
       | 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 "user2" user to "CH1" cohort
+    And I add "user3" user to "CH1" cohort
     And I follow "Browse list of users"
 
   @javascript
   Scenario: Filter user accounts by role and cohort
-    When I set the following fields to these values:
+    When I fill the moodle form with:
       | courserole_rl | Student |
       | courserole_ct | any category |
       | courserole | C1 |
@@ -38,7 +38,7 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
     And I should see "User Two"
     And I should see "User Three"
     And I should not see "User Four"
-    And I set the following fields to these values:
+    And I fill the moodle form with:
       | cohort | CH1 |
     And I press "Add filter"
     And I should not see "User One"
@@ -53,14 +53,14 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
 
   @javascript
   Scenario: Filter user accounts by confirm and authentication method
-    When I set the following fields to these values:
+    When I fill the moodle form with:
       | Confirmed | No |
     And I press "Add filter"
     Then I should see "User One"
     And I should not see "User Two"
     And I should not see "User Three"
     And I should see "User Four"
-    And I set the following fields to these values:
+    And I fill the moodle form with:
       | Authentication | manual |
     And I press "Add filter"
     And I should see "User One"

admin/tests/behat/set_admin_settings_value.feature

@@ -1,26 +0,0 @@
-@core @core_admin
-Feature: Set admin settings value
-  In order to set admin settings value
-  As an admin
-  I need to set admin setting value and verify it is applied
-
-  Background:
-    Given the following "courses" exist:
-      | fullname | shortname | category |
-      | Course fullname | C_shortname | 0 |
-    And I log in as "admin"
-    And I am on site homepage
-    And I should see "Course fullname"
-    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 |
-    And I am on site 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:
-      | courselistshortnames | 1 |
-    And I am on site homepage
-    Then I should see "C_shortname Course fullname"

admin/tests/behat/upload_users.feature

@@ -1,4 +1,4 @@
-@core @core_admin @_file_upload
+@core @core_admin @_only_local @_file_upload
 Feature: Upload users
   In order to add users to the system
   As an admin
@@ -6,22 +6,26 @@ Feature: Upload users
 
   @javascript
   Scenario: Upload users enrolling them on courses and groups
-    Given the following "courses" exist:
+    Given the following "courses" exists:
       | fullname | shortname | category |
       | Maths | math102 | 0 |
-    And the following "groups" exist:
+    And the following "groups" exists:
       | name | course | idnumber |
       | Section 1 | math102 | S1 |
       | Section 3 | math102 | S3 |
     And I log in as "admin"
-    And I navigate to "Upload users" node in "Site administration > Users > Accounts"
+    And I collapse "Front page settings" node
+    And I expand "Site administration" node
+    And I expand "Users" node
+    And I expand "Accounts" node
+    And I follow "Upload users"
     When I upload "lib/tests/fixtures/upload_users.csv" file to "File" filemanager
     And I press "Upload users"
     Then I should see "Upload users preview"
     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,10 +36,10 @@ 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 am on site homepage
+    And I should see "reznor@someplace.edu"
+    And I am on homepage
     And I follow "Maths"
     And I expand "Users" node
     And I follow "Groups"
-    And I set the field "groups" to "Section 1 (1)"
+    And I select "Section 1 (1)" from "groups"
     And the "members" select box should contain "Tom Jones"

admin/timezone.php

@@ -41,11 +41,11 @@
     }
 
     require_once($CFG->dirroot.'/calendar/lib.php');
-    $timezones = core_date::get_list_of_timezones(null, true);
+    $timezones = get_list_of_timezones();
 
     echo '<center><form action="timezone.php" method="post">';
     echo html_writer::label($strusers . ' (' . $strall . '): ', 'menuzone');
-    echo html_writer::select($timezones, "zone", $current);
+    echo html_writer::select($timezones, "zone", $current, array('99'=>get_string("serverlocaltime")));
     echo "<input type=\"hidden\" name=\"sesskey\" value=\"".sesskey()."\" />";
     echo '<input type="submit" value="'.s($strsavechanges).'" />';
     echo "</form></center>";

admin/tool/assignmentupgrade/module.js

@@ -55,7 +55,7 @@ M.tool_assignmentupgrade = {
             assignmentsinput = Y.one('input.selectedassignments');
             assignmentsinput.set('value', selectedassignments.join(','));
             if (selectedassignments.length == 0) {
-                alert(M.util.get_string('noassignmentsselected', 'tool_assignmentupgrade'));
+                alert(M.str.tool_assignmentupgrade.noassignmentsselected);
                 e.preventDefault();
             }
         });

admin/tool/assignmentupgrade/version.php

@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2015051100;
-$plugin->requires  = 2015050500;
+$plugin->version   = 2013110500;
+$plugin->requires  = 2013110500;
 $plugin->component = 'tool_assignmentupgrade';
-$plugin->dependencies = array('mod_assign' => 2015050500);
+$plugin->dependencies = array('mod_assign' => 2013110500);

admin/tool/availabilityconditions/index.php

@@ -1,124 +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/>.
-
-/**
- * Provides an overview of installed availability conditions.
- *
- * You can also enable/disable them from this screen.
- *
- * @package tool_availabilityconditions
- * @copyright 2014 The Open University
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-require_once(__DIR__ . '/../../../config.php');
-require_once($CFG->libdir . '/adminlib.php');
-require_once($CFG->libdir . '/tablelib.php');
-
-admin_externalpage_setup('manageavailability');
-
-// Get sorted list of all availability condition plugins.
-$plugins = array();
-foreach (core_component::get_plugin_list('availability') as $plugin => $plugindir) {
-    if (get_string_manager()->string_exists('pluginname', 'availability_' . $plugin)) {
-        $strpluginname = get_string('pluginname', 'availability_' . $plugin);
-    } else {
-        $strpluginname = $plugin;
-    }
-    $plugins[$plugin] = $strpluginname;
-}
-core_collator::asort($plugins);
-
-// Do plugin actions.
-$pageurl = new moodle_url('/' . $CFG->admin . '/tool/availabilityconditions/');
-if (($plugin = optional_param('plugin', '', PARAM_PLUGIN))) {
-    require_sesskey();
-    if (!array_key_exists($plugin, $plugins)) {
-        print_error('invalidcomponent', 'error', $pageurl);
-    }
-    $action = required_param('action', PARAM_ALPHA);
-    switch ($action) {
-        case 'hide' :
-            set_config('disabled', 1, 'availability_' . $plugin);
-            break;
-        case 'show' :
-            unset_config('disabled', 'availability_' . $plugin);
-            break;
-    }
-    core_plugin_manager::reset_caches();
-
-    // Always redirect back after an action.
-    redirect($pageurl);
-}
-
-echo $OUTPUT->header();
-echo $OUTPUT->heading(get_string('manageplugins', 'availability'));
-
-// Show a table of installed availability conditions.
-$table = new flexible_table('availabilityconditions_administration_table');
-$table->define_columns(array('name', 'version', 'enable'));
-$table->define_headers(array(get_string('plugin'),
-        get_string('version'), get_string('hide') . '/' . get_string('show')));
-$table->define_baseurl($PAGE->url);
-$table->set_attribute('id', 'availabilityconditions');
-$table->set_attribute('class', 'admintable generaltable');
-$table->setup();
-
-$enabledlist = core\plugininfo\availability::get_enabled_plugins();
-foreach ($plugins as $plugin => $name) {
-
-    // Get version or ? if unknown.
-    $version = get_config('availability_' . $plugin);
-    if (!empty($version->version)) {
-        $version = $version->version;
-    } else {
-        $version = '?';
-    }
-
-    // Get enabled status and use to grey out name if necessary.
-    $enabled = in_array($plugin, $enabledlist);
-    if ($enabled) {
-        $enabledaction = 'hide';
-        $enabledstr = get_string('hide');
-        $class = '';
-    } else {
-        $enabledaction = 'show';
-        $enabledstr = get_string('show');
-        $class = 'dimmed_text';
-    }
-    $namespan = html_writer::span($name, $class);
-
-    // Make enable control. This is a POST request (using a form control rather
-    // than just a link) because it makes a database change.
-    $enablecontrol = html_writer::tag('form', html_writer::div(
-            html_writer::empty_tag('input', array('type' => 'hidden',
-                    'name' => 'sesskey', 'value' => sesskey())) .
-            html_writer::empty_tag('input', array('type' => 'hidden',
-                    'name' => 'plugin', 'value' => $plugin)) .
-            html_writer::empty_tag('input', array('type' => 'hidden',
-                    'name' => 'action', 'value' => $enabledaction)) .
-            html_writer::empty_tag('input', array('type' => 'image',
-                    'src' => $OUTPUT->pix_url('t/' . $enabledaction), 'alt' => $enabledstr,
-                    'title' => $enabledstr))
-            ), array(
-            'method' => 'post', 'action' => './'));
-
-    $table->add_data(array($namespan, $version, $enablecontrol));
-}
-
-$table->print_html();
-
-echo $OUTPUT->footer();

admin/tool/availabilityconditions/lang/en/tool_availabilityconditions.php

@@ -1,26 +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/>.
-
-/**
- * Strings for availability conditions options.
- *
- * @package core_availability
- * @copyright 2014 The Open University
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-$string['manageplugins'] = 'Manage restrictions';
-$string['pluginname'] = 'Availability condition management';

admin/tool/availabilityconditions/settings.php

@@ -1,37 +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/>.
-
-/**
- * Adds settings links to admin tree.
- *
- * @package tool_availabilityconditions
- * @copyright 2014 The Open University
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-if ($hassiteconfig && !empty($CFG->enableavailability)) {
-    $ADMIN->add('modules', new admin_category('availabilitysettings',
-            new lang_string('type_availability_plural', 'plugin')));
-    $ADMIN->add('availabilitysettings', new admin_externalpage('manageavailability',
-            new lang_string('manageplugins', 'tool_availabilityconditions'),
-            $CFG->wwwroot . '/' . $CFG->admin . '/tool/availabilityconditions/'));
-    foreach (core_plugin_manager::instance()->get_plugins_of_type('availability') as $plugin) {
-        /** @var \core\plugininfo\format $plugin */
-        $plugin->load_settings($ADMIN, 'availabilitysettings', $hassiteconfig);
-    }
-}

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

@@ -1,58 +0,0 @@
-@tool @tool_availabilityconditions
-Feature: Manage availability conditions
-  In order to control availability restrictions
-  As an administrator
-  I need to see the list of restrictions and hide or show them
-
-  @javascript
-  Scenario: Display list of availability conditions
-    # Check the report doesn't show when not enabled.
-    Given I log in as "admin"
-    And I expand "Site administration" node
-    When I expand "Plugins" node
-    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 am on homepage
-    And I navigate to "Manage restrictions" node in "Site administration > Plugins > Availability restrictions"
-
-    # Having clicked on it, I should also see the list of plugins.
-    And I should see "Restriction by date"
-    And I should see "Restriction by grades"
-
-  @javascript
-  Scenario: Hide and show conditions
-    # Get to the right page
-    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 am on site homepage
-    When I navigate to "Manage restrictions" node in "Site administration > Plugins > Availability restrictions"
-
-    # Check the icon is there (it should be a Hide icon, meaning is currently visible).
-    Then "input[title=Hide]" "css_element" should exist in the "Restriction by date" "table_row"
-
-    # Click the icon. It should toggle to hidden (title=Show).
-    And I click on "input[title=Hide]" "css_element" in the "Restriction by date" "table_row"
-    And "input[title=Show]" "css_element" should exist in the "Restriction by date" "table_row"
-
-    # Toggle it back to visible (title=Hide).
-    And I click on "input[title=Show]" "css_element" in the "Restriction by date" "table_row"
-    And "input[title=Hide]" "css_element" should exist in the "Restriction by date" "table_row"
-
-    # OK, toggling works. Set the grade one to Hide and we'll go see if it actually worked.
-    And I click on "input[title=Hide]" "css_element" in the "Restriction by grade" "table_row"
-    And I am on site homepage
-    And I follow "Course 1"
-    And I turn editing mode on
-    And I add a "Page" to section "1"
-    And I expand all fieldsets
-    And I click on "Add restriction..." "button"
-    And "Add restriction..." "dialogue" should be visible
-    And "Date" "button" should exist in the "Add restriction..." "dialogue"
-    And "Grade" "button" should not exist in the "Add restriction..." "dialogue"

admin/tool/availabilityconditions/version.php

@@ -1,29 +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/>.
-
-/**
- * Version
- *
- * @package tool_availabilityconditions
- * @copyright 2014 The Open University
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-$plugin->version = 2015051100;
-$plugin->requires = 2015050500;
-$plugin->component = 'tool_availabilityconditions';

admin/tool/behat/cli/init.php

@@ -40,113 +40,61 @@ define('CACHE_DISABLE_ALL', true);
 require_once(__DIR__ . '/../../../../lib/clilib.php');
 require_once(__DIR__ . '/../../../../lib/behat/lib.php');
 
-list($options, $unrecognized) = cli_get_params(
-    array(
-        'parallel' => 0,
-        'maxruns'  => false,
-        'help'     => false,
-        'fromrun'  => 1,
-        'torun'    => 0,
-    ),
-    array(
-        'j' => 'parallel',
-        'm' => 'maxruns',
-        'h' => 'help',
-    )
-);
-
-// Checking run.php CLI script usage.
-$help = "
-Behat utilities to initialise behat tests
-
-Usage:
-  php init.php [--parallel=value [--maxruns=value] [--fromrun=value --torun=value]] [--help]
-
-Options:
--j, --parallel Number of parallel behat run to initialise
--m, --maxruns  Max parallel processes to be executed at one time.
---fromrun      Execute run starting from (Used for parallel runs on different vms)
---torun        Execute run till (Used for parallel runs on different vms)
-
--h, --help     Print out this help
-
-Example from Moodle root directory:
-\$ php admin/tool/behat/cli/init.php --parallel=2
-
-More info in http://docs.moodle.org/dev/Acceptance_testing#Running_tests
-";
-
-if (!empty($options['help'])) {
-    echo $help;
-    exit(0);
-}
-
-// Check which util file to call.
-$utilfile = 'util_single_run.php';
-$paralleloption = "";
-// If parallel run then use utilparallel.
-if ($options['parallel'] && $options['parallel'] > 1) {
-    $utilfile = 'util.php';
-    $paralleloption = "";
-    foreach ($options as $option => $value) {
-        if ($value) {
-            $paralleloption .= " --$option=\"$value\"";
-        }
-    }
-}
-
 // Changing the cwd to admin/tool/behat/cli.
-$cwd = getcwd();
-$output = null;
-
-// If behat dependencies not downloaded then do it first, else symfony/process can't be used.
-testing_update_composer_dependencies();
-
-// Check whether the behat test environment needs to be updated.
 chdir(__DIR__);
-exec("php $utilfile --diag $paralleloption", $output, $code);
-
+$output = null;
+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 $utilfile --install $paralleloption", $code);
+    passthru("php util.php --install", $code);
     if ($code != 0) {
-        chdir($cwd);
         exit($code);
     }
 
 } else if ($code == BEHAT_EXITCODE_REINSTALL) {
+
+    testing_update_composer_dependencies();
+
     // Test site data is outdated.
     chdir(__DIR__);
-    passthru("php $utilfile --drop $paralleloption", $code);
+    passthru("php util.php --drop", $code);
     if ($code != 0) {
-        chdir($cwd);
         exit($code);
     }
 
-    chdir(__DIR__);
-    passthru("php $utilfile --install $paralleloption", $code);
+    passthru("php util.php --install", $code);
+    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) {
-        chdir($cwd);
         exit($code);
     }
 
 } else {
     // Generic error, we just output it.
     echo implode("\n", $output)."\n";
-    chdir($cwd);
     exit($code);
 }
 
 // Enable editing mode according to config.php vars.
-chdir(__DIR__);
-passthru("php $utilfile --enable $paralleloption", $code);
+passthru("php util.php --enable", $code);
 if ($code != 0) {
-    echo "Error enabling site" . PHP_EOL;
-    chdir($cwd);
     exit($code);
 }
 

admin/tool/behat/cli/run.php

@@ -1,398 +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/>.
-
-/**
- * Wrapper to run previously set-up behat tests in parallel.
- *
- * @package    tool_behat
- * @copyright  2014 NetSpot Pty Ltd
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-if (isset($_SERVER['REMOTE_ADDR'])) {
-    die(); // No access from web!
-}
-
-define('BEHAT_UTIL', true);
-define('CLI_SCRIPT', true);
-define('ABORT_AFTER_CONFIG', true);
-define('CACHE_DISABLE_ALL', true);
-define('NO_OUTPUT_BUFFERING', true);
-
-require_once(__DIR__ .'/../../../../config.php');
-require_once(__DIR__.'/../../../../lib/clilib.php');
-require_once(__DIR__.'/../../../../lib/behat/lib.php');
-require_once(__DIR__.'/../../../../lib/behat/classes/behat_command.php');
-require_once(__DIR__.'/../../../../lib/behat/classes/behat_config_manager.php');
-
-error_reporting(E_ALL | E_STRICT);
-ini_set('display_errors', '1');
-ini_set('log_errors', '1');
-
-list($options, $unrecognised) = cli_get_params(
-    array(
-        'stop-on-failure' => 0,
-        'verbose'  => false,
-        'replace'  => false,
-        'help'     => false,
-        'tags'     => '',
-        'profile'  => '',
-        'feature'  => '',
-        'fromrun'  => 1,
-        'torun'    => 0,
-        'single-run' => false,
-    ),
-    array(
-        'h' => 'help',
-        't' => 'tags',
-        'p' => 'profile',
-        's' => 'single-run',
-    )
-);
-
-// Checking run.php CLI script usage.
-$help = "
-Behat utilities to run behat tests in parallel
-
-Usage:
-  php run.php [--BEHAT_OPTION=\"value\"] [--feature=\"value\"] [--replace] [--fromrun=value --torun=value] [--help]
-
-Options:
---BEHAT_OPTION     Any combination of behat option specified in http://behat.readthedocs.org/en/v2.5/guides/6.cli.html
---feature          Only execute specified feature file (Absolute path of feature file).
---replace          Replace args string with run process number, useful for output.
---fromrun          Execute run starting from (Used for parallel runs on different vms)
---torun            Execute run till (Used for parallel runs on different vms)
-
--h, --help         Print out this help
-
-Example from Moodle root directory:
-\$ php admin/tool/behat/cli/run.php --tags=\"@javascript\"
-
-More info in http://docs.moodle.org/dev/Acceptance_testing#Running_tests
-";
-
-if (!empty($options['help'])) {
-    echo $help;
-    exit(0);
-}
-
-$parallelrun = behat_config_manager::get_parallel_test_runs($options['fromrun']);
-
-// Default torun is maximum parallel runs.
-if (empty($options['torun'])) {
-    $options['torun'] = $parallelrun;
-}
-
-// Capture signals and ensure we clean symlinks.
-if (extension_loaded('pcntl')) {
-    $disabled = explode(',', ini_get('disable_functions'));
-    if (!in_array('pcntl_signal', $disabled)) {
-        pcntl_signal(SIGTERM, "signal_handler");
-        pcntl_signal(SIGINT, "signal_handler");
-    }
-}
-
-$time = microtime(true);
-array_walk($unrecognised, function (&$v) {
-    if ($x = preg_filter("#^(-+\w+)=(.+)#", "\$1=\"\$2\"", $v)) {
-        $v = $x;
-    } else if (!preg_match("#^-#", $v)) {
-        $v = escapeshellarg($v);
-    }
-});
-$extraopts = $unrecognised;
-
-$tags = '';
-
-if ($options['profile']) {
-    $profile = $options['profile'];
-    if (!isset($CFG->behat_config[$profile])) {
-        echo "Invalid profile passed: " . $profile;
-        exit(1);
-    }
-    $extraopts[] = '--profile="' . $profile . '"';
-    // By default, profile tags will be used.
-    if (!empty($CFG->behat_config[$profile]['filters']['tags'])) {
-        $tags = $CFG->behat_config[$profile]['filters']['tags'];
-    }
-}
-
-// Command line tags have precedence (std behat behavior).
-if ($options['tags']) {
-    $tags = $options['tags'];
-    $extraopts[] = '--tags="' . $tags . '"';
-}
-
-// Feature should be added to last, for behat command.
-if ($options['feature']) {
-    $extraopts[] = $options['feature'];
-    // Only run 1 process as process.
-    // Feature file is picked from absolute path provided, so no need to check for behat.yml.
-    $options['torun'] = $options['fromrun'];
-}
-
-// Set of options to pass to behat.
-$extraopts = implode(' ', $extraopts);
-
-// If empty parallelrun then just check with user if it's a run single behat test.
-if (empty($parallelrun)) {
-    $cwd = getcwd();
-    chdir(__DIR__);
-    $runtestscommand = behat_command::get_behat_command(false, false, true);
-    $runtestscommand .= ' --config ' . behat_config_manager::get_behat_cli_config_filepath();
-    $runtestscommand .= ' ' . $extraopts;
-    echo "Running single behat site:" . PHP_EOL;
-    passthru("php $runtestscommand", $code);
-    chdir($cwd);
-    exit($code);
-}
-
-// Update config file if tags defined.
-if ($tags) {
-    // Hack to set proper dataroot and wwwroot.
-    $behatdataroot = $CFG->behat_dataroot;
-    $behatwwwroot  = $CFG->behat_wwwroot;
-    for ($i = 1; $i <= $parallelrun; $i++) {
-        $CFG->behatrunprocess = $i;
-
-        if (!empty($CFG->behat_parallel_run[$i - 1]['behat_wwwroot'])) {
-            $CFG->behat_wwwroot = $CFG->behat_parallel_run[$i - 1]['behat_wwwroot'];
-        } else {
-            $CFG->behat_wwwroot = $behatwwwroot . "/" . BEHAT_PARALLEL_SITE_NAME . $i;
-        }
-        if (!empty($CFG->behat_parallel_run[$i - 1]['behat_dataroot'])) {
-            $CFG->behat_dataroot = $CFG->behat_parallel_run[$i - 1]['behat_dataroot'];
-        } else {
-            $CFG->behat_dataroot = $behatdataroot . $i;
-        }
-        behat_config_manager::update_config_file('', true, $tags);
-    }
-    $CFG->behat_dataroot = $behatdataroot;
-    $CFG->behat_wwwroot = $behatwwwroot;
-    unset($CFG->behatrunprocess);
-}
-
-$cmds = array();
-echo "Running " . ($options['torun'] - $options['fromrun'] + 1) . " parallel behat sites:" . PHP_EOL;
-
-for ($i = $options['fromrun']; $i <= $options['torun']; $i++) {
-    $CFG->behatrunprocess = $i;
-
-    // Options parameters to be added to each run.
-    $myopts = !empty($options['replace']) ? str_replace($options['replace'], $i, $extraopts) : $extraopts;
-
-    $behatcommand = behat_command::get_behat_command(false, false, true);
-    $behatconfigpath = behat_config_manager::get_behat_cli_config_filepath($i);
-
-    // Command to execute behat run.
-    $cmds[BEHAT_PARALLEL_SITE_NAME . $i] = $behatcommand . ' --config ' . $behatconfigpath . " " . $myopts;
-    echo "[" . BEHAT_PARALLEL_SITE_NAME . $i . "] " . $cmds[BEHAT_PARALLEL_SITE_NAME . $i] . PHP_EOL;
-}
-
-if (empty($cmds)) {
-    echo "No commands to execute " . PHP_EOL;
-    exit(1);
-}
-
-// Create site symlink if necessary.
-if (!behat_config_manager::create_parallel_site_links($options['fromrun'], $options['torun'])) {
-    echo "Check permissions. If on windows, make sure you are running this command as admin" . PHP_EOL;
-    exit(1);
-}
-
-// Execute all commands.
-$processes = cli_execute_parallel($cmds, __DIR__);
-$stoponfail = empty($options['stop-on-failure']) ? false : true;
-
-// Print header.
-print_process_start_info($processes);
-
-// Print combined run o/p from processes.
-$exitcodes = print_combined_run_output($processes, $stoponfail);
-$time = round(microtime(true) - $time, 1);
-echo "Finished in " . gmdate("G\h i\m s\s", $time) . PHP_EOL . PHP_EOL;
-
-
-// Print exit info from each run.
-$status = false;
-foreach ($exitcodes as $exitcode) {
-    $status = (bool)$status || (bool)$exitcode;
-}
-
-// Run finished. Show exit code and output from individual process.
-$verbose = empty($options['verbose']) ? false : true;
-$verbose = $verbose || $status;
-
-// Show exit code from each process, if any process failed.
-if ($verbose) {
-    // Echo exit codes.
-    echo "Exit codes for each behat run: " . PHP_EOL;
-    ksort($exitcodes);
-    foreach ($exitcodes as $run => $exitcode) {
-        echo $run . ": " . $exitcode . PHP_EOL;
-    }
-
-    // Show failed re-run commands.
-    if ($status) {
-        echo "To re-run failed processes, you can use following commands:" . PHP_EOL;
-        foreach ($cmds as $name => $cmd) {
-            if (!empty($exitcodes[$name])) {
-                echo "[" . $name . "] " . $cmd . PHP_EOL;
-            }
-        }
-    }
-    echo PHP_EOL;
-}
-
-print_each_process_info($processes, $verbose);
-
-// Remove site symlink if necessary.
-behat_config_manager::drop_parallel_site_links();
-
-exit((int) $status);
-
-/**
- * Signal handler for terminal exit.
- *
- * @param int $signal signal number.
- */
-function signal_handler($signal) {
-    switch ($signal) {
-        case SIGTERM:
-        case SIGKILL:
-        case SIGINT:
-            // Remove site symlink if necessary.
-            behat_config_manager::drop_parallel_site_links();
-            exit(1);
-    }
-}
-
-/**
- * Prints header from the first process.
- *
- * @param array $processes list of processes to loop though.
- */
-function print_process_start_info($processes) {
-    $printed = false;
-    // Keep looping though processes, till we get first process o/p.
-    while (!$printed) {
-        usleep(10000);
-        foreach ($processes as $name => $process) {
-            // Exit if any process has stopped.
-            if (!$process->isRunning()) {
-                $printed = true;
-                break;
-            }
-
-            $op = explode(PHP_EOL, $process->getOutput());
-            if (count($op) >= 3) {
-                foreach ($op as $line) {
-                    if (trim($line) && (strpos($line, '.') !== 0)) {
-                        echo $line . PHP_EOL;
-                    }
-                }
-                $printed = true;
-            }
-        }
-    }
-}
-
-/**
- * Loop though all processes and print combined o/p
- *
- * @param array $processes list of processes to loop though.
- * @param bool $stoponfail Stop all processes and exit if failed.
- * @return array list of exit codes from all processes.
- */
-function print_combined_run_output($processes, $stoponfail = false) {
-    $exitcodes = array();
-    $maxdotsonline = 70;
-    $remainingprintlen = $maxdotsonline;
-    $progresscount = 0;
-    while (count($exitcodes) != count($processes)) {
-        usleep(10000);
-        foreach ($processes as $name => $process) {
-            if ($process->isRunning()) {
-                $op = $process->getIncrementalOutput();
-                if (trim($op)) {
-                    $update = preg_filter('#^\s*([FS\.\-]+)(?:\s+\d+)?\s*$#', '$1', $op);
-                    // Exit process if anything fails.
-                    if ($stoponfail && (strpos($update, 'F') !== false)) {
-                        $process->stop(0);
-                    }
-
-                    $strlentoprint = strlen($update);
-
-                    // If not enough dots printed on line then just print.
-                    if ($strlentoprint < $remainingprintlen) {
-                        echo $update;
-                        $remainingprintlen = $remainingprintlen - $strlentoprint;
-                    } else if ($strlentoprint == $remainingprintlen) {
-                        $progresscount += $maxdotsonline;
-                        echo $update ." " . $progresscount . PHP_EOL;
-                        $remainingprintlen = $maxdotsonline;
-                    } else {
-                        while ($part = substr($update, 0, $remainingprintlen) > 0) {
-                            $progresscount += $maxdotsonline;
-                            echo $part . " " . $progresscount . PHP_EOL;
-                            $update = substr($update, $remainingprintlen);
-                            $remainingprintlen = $maxdotsonline;
-                        }
-                    }
-                }
-            } else {
-                $exitcodes[$name] = $process->getExitCode();
-                if ($stoponfail && ($exitcodes[$name] != 0)) {
-                    foreach ($processes as $l => $p) {
-                        $exitcodes[$l] = -1;
-                        $process->stop(0);
-                    }
-                }
-            }
-        }
-    }
-
-    echo PHP_EOL;
-    return $exitcodes;
-}
-
-/**
- * Loop though all processes and print combined o/p
- *
- * @param array $processes list of processes to loop though.
- * @param bool $verbose Show verbose output for each process.
- */
-function print_each_process_info($processes, $verbose = false) {
-    foreach ($processes as $name => $process) {
-        echo "**************** [" . $name . "] ****************" . PHP_EOL;
-        if ($verbose) {
-            echo $process->getOutput();
-            echo $process->getErrorOutput();
-        } else {
-            $op = explode(PHP_EOL, $process->getOutput());
-            foreach ($op as $line) {
-                // Don't print progress .
-                if (trim($line) && (strpos($line, '.') !== 0) && (strpos($line, 'Moodle ') !== 0) &&
-                    (strpos($line, 'Server OS ') !== 0) && (strpos($line, 'Started at ') !== 0) &&
-                    (strpos($line, 'Browser specific fixes ') !== 0)) {
-                    echo $line . PHP_EOL;
-                }
-            }
-        }
-        echo PHP_EOL;
-    }
-}

admin/tool/behat/cli/util.php

@@ -15,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * CLI tool with utilities to manage parallel Behat integration in Moodle
+ * CLI tool with utilities to manage Behat integration in Moodle
  *
  * All CLI utilities uses $CFG->behat_dataroot and $CFG->prefix_dataroot as
  * $CFG->dataroot and $CFG->prefix
@@ -30,61 +30,45 @@ if (isset($_SERVER['REMOTE_ADDR'])) {
     die(); // No access from web!.
 }
 
-define('BEHAT_UTIL', true);
-define('CLI_SCRIPT', true);
-define('NO_OUTPUT_BUFFERING', true);
-define('IGNORE_COMPONENT_CACHE', true);
-define('ABORT_AFTER_CONFIG', true);
-
-require_once(__DIR__ . '/../../../../config.php');
+// Basic functions.
 require_once(__DIR__ . '/../../../../lib/clilib.php');
 require_once(__DIR__ . '/../../../../lib/behat/lib.php');
-require_once(__DIR__ . '/../../../../lib/behat/classes/behat_command.php');
-require_once(__DIR__ . '/../../../../lib/behat/classes/behat_config_manager.php');
+
 
 // CLI options.
 list($options, $unrecognized) = cli_get_params(
     array(
-        'help'        => false,
-        'install'     => false,
-        'drop'        => false,
-        'enable'      => false,
-        'disable'     => false,
-        'diag'        => false,
-        'parallel'    => 0,
-        'maxruns'     => false,
-        'updatesteps' => false,
-        'fromrun'     => 1,
-        'torun'       => 0,
+        'help'    => false,
+        'install' => false,
+        'drop'    => false,
+        'enable'  => false,
+        'disable' => false,
+        'diag'    => false
     ),
     array(
-        'h' => 'help',
-        'j' => 'parallel',
-        'm' => 'maxruns'
+        'h' => 'help'
     )
 );
 
+if ($options['install'] or $options['drop']) {
+    define('CACHE_DISABLE_ALL', true);
+}
+
 // Checking util.php CLI script usage.
 $help = "
 Behat utilities to manage the test environment
 
-Usage:
-  php util.php [--install|--drop|--enable|--disable|--diag|--updatesteps|--help] [--parallel=value [--maxruns=value]]
-
 Options:
---install      Installs the test environment for acceptance tests
---drop         Drops the database tables and the dataroot contents
---enable       Enables test environment and updates tests list
---disable      Disables test environment
---diag         Get behat test environment status code
---updatesteps  Update feature step file.
--j, --parallel Number of parallel behat run operation
--m, --maxruns  Max parallel processes to be executed at one time.
+--install  Installs the test environment for acceptance tests
+--drop     Drops the database tables and the dataroot contents
+--enable   Enables test environment and updates tests list
+--disable  Disables test environment
+--diag     Get behat test environment status code
 
 -h, --help     Print out this help
 
 Example from Moodle root directory:
-\$ php admin/tool/behat/cli/util.php --enable --parallel=4
+\$ php admin/tool/behat/cli/util.php --enable
 
 More info in http://docs.moodle.org/dev/Acceptance_testing#Running_tests
 ";
@@ -94,348 +78,122 @@ if (!empty($options['help'])) {
     exit(0);
 }
 
-$cwd = getcwd();
 
-// For drop option check if parallel site.
-if ((empty($options['parallel'])) && ($options['drop']) || $options['updatesteps']) {
-    // Get parallel run info from first run.
-    $options['parallel'] = behat_config_manager::get_parallel_test_runs($options['fromrun']);
+// Checking $CFG->behat_* vars and values.
+define('BEHAT_UTIL', true);
+define('CLI_SCRIPT', true);
+define('ABORT_AFTER_CONFIG', true);
+define('NO_OUTPUT_BUFFERING', true);
+define('IGNORE_COMPONENT_CACHE', true);
+
+error_reporting(E_ALL | E_STRICT);
+ini_set('display_errors', '1');
+ini_set('log_errors', '1');
+
+// Getting $CFG data.
+require_once(__DIR__ . '/../../../../config.php');
+
+// When we use the utilities we don't know how the site
+// will be accessed, so if neither $CFG->behat_switchcompletely or
+// $CFG->behat_wwwroot are set we must think that the site will
+// be accessed using the built-in server which is set by default
+// to localhost:8000. We need to do this to prevent uses of the production
+// wwwroot when the site is being installed / dropped...
+$CFG->behat_wwwroot = behat_get_wwwroot();
+
+// Checking the integrity of the provided $CFG->behat_* vars
+// to prevent conflicts with production and phpunit environments.
+behat_check_config_vars();
+
+// Create behat_dataroot if it doesn't exists.
+if (!file_exists($CFG->behat_dataroot)) {
+    if (!mkdir($CFG->behat_dataroot, $CFG->directorypermissions)) {
+        behat_error(BEHAT_EXITCODE_PERMISSIONS, '$CFG->behat_dataroot directory can not be created');
+    }
+}
+if (!is_dir($CFG->behat_dataroot) || !is_writable($CFG->behat_dataroot)) {
+    behat_error(BEHAT_EXITCODE_PERMISSIONS, '$CFG->behat_dataroot directory has no permissions or is not a directory');
 }
 
-// If not a parallel site then open single run.
-if (empty($options['parallel'])) {
-    chdir(__DIR__);
-    // Check if behat is initialised, if not exit.
-    passthru("php util_single_run.php --diag", $status);
-    if ($status) {
-        exit ($status);
-    }
-    $cmd = commands_to_execute($options);
-    $processes = cli_execute_parallel(array($cmd), __DIR__);
-    $status = print_sequential_output($processes, false);
-    chdir($cwd);
-    exit($status);
-}
-
-// Default torun is maximum parallel runs.
-if (empty($options['torun'])) {
-    $options['torun'] = $options['parallel'];
-}
-
-$status = false;
-$cmds = commands_to_execute($options);
-
-// Start executing commands either sequential/parallel for options provided.
-if ($options['diag'] || $options['enable'] || $options['disable']) {
-    // Do it sequentially as it's fast and need to be displayed nicely.
-    foreach (array_chunk($cmds, 1, true) as $cmd) {
-        $processes = cli_execute_parallel($cmd, __DIR__);
-        print_sequential_output($processes);
-    }
-
-} else if ($options['drop']) {
-    $processes = cli_execute_parallel($cmds, __DIR__);
-    $exitcodes = print_combined_drop_output($processes);
-    foreach ($exitcodes as $exitcode) {
-        $status = (bool)$status || (bool)$exitcode;
-    }
-
-} else if ($options['install']) {
-    // This is intensive compared to behat itself so run them in chunk if option maxruns not set.
-    if ($options['maxruns']) {
-        foreach (array_chunk($cmds, $options['maxruns'], true) as $chunk) {
-            $processes = cli_execute_parallel($chunk, __DIR__);
-            $exitcodes = print_combined_install_output($processes);
-            foreach ($exitcodes as $name => $exitcode) {
-                if ($exitcode != 0) {
-                    echo "Failed process [[$name]]" . PHP_EOL;
-                    echo $processes[$name]->getOutput();
-                    echo PHP_EOL;
-                    echo $processes[$name]->getErrorOutput();
-                    echo PHP_EOL . PHP_EOL;
-                }
-                $status = (bool)$status || (bool)$exitcode;
+// Check that the directory does not contains other things.
+if (!file_exists("$CFG->behat_dataroot/behattestdir.txt")) {
+    if ($dh = opendir($CFG->behat_dataroot)) {
+        while (($file = readdir($dh)) !== false) {
+            if ($file === 'behat' or $file === '.' or $file === '..' or $file === '.DS_Store') {
+                continue;
             }
+            behat_error(BEHAT_EXITCODE_CONFIG, '$CFG->behat_dataroot directory is not empty, ensure this is the directory where you want to install behat test dataroot');
         }
-    } else {
-        $processes = cli_execute_parallel($cmds, __DIR__);
-        $exitcodes = print_combined_install_output($processes);
-        foreach ($exitcodes as $name => $exitcode) {
-            if ($exitcode != 0) {
-                echo "Failed process [[$name]]" . PHP_EOL;
-                echo $processes[$name]->getOutput();
-                echo PHP_EOL;
-                echo $processes[$name]->getErrorOutput();
-                echo PHP_EOL . PHP_EOL;
-            }
-            $status = (bool)$status || (bool)$exitcode;
-        }
+        closedir($dh);
+        unset($dh);
+        unset($file);
     }
 
-} else if ($options['updatesteps']) {
-    // Rewrite config file to ensure we have all the features covered.
-    if (empty($options['parallel'])) {
-        behat_config_manager::update_config_file();
-    } else {
-        // Update config file, ensuring we have up-to-date behat.yml.
-        for ($i = $options['fromrun']; $i <= $options['torun']; $i++) {
-            $CFG->behatrunprocess = $i;
-            behat_config_manager::update_config_file();
-        }
-        unset($CFG->behatrunprocess);
-    }
-
-    // Do it sequentially as it's fast and need to be displayed nicely.
-    foreach (array_chunk($cmds, 1, true) as $cmd) {
-        $processes = cli_execute_parallel($cmd, __DIR__);
-        print_sequential_output($processes);
-    }
-    exit(0);
-
-} else {
-    // We should never reach here.
-    echo $help;
-    exit(1);
+    // Now we create dataroot directory structure for behat tests.
+    testing_initdataroot($CFG->behat_dataroot, 'behat');
 }
 
-// Ensure we have success status to show following information.
-if ($status) {
-    echo "Unknown failure $status" . PHP_EOL;
-    exit((int)$status);
+// Overrides vars with behat-test ones.
+$vars = array('wwwroot', 'prefix', 'dataroot');
+foreach ($vars as $var) {
+    $CFG->{$var} = $CFG->{'behat_' . $var};
 }
 
-// Show command o/p (only one per time).
+// Clean $CFG extra values before performing any action.
+behat_clean_init_config();
+
+$CFG->noemailever = true;
+$CFG->passwordsaltmain = 'moodle';
+
+$CFG->themerev = 1;
+$CFG->jsrev = 1;
+
+// Unset cache and temp directories to reset them again with the new $CFG->dataroot.
+unset($CFG->cachedir);
+unset($CFG->localcachedir);
+unset($CFG->tempdir);
+
+// Continues setup.
+define('ABORT_AFTER_CONFIG_CANCEL', true);
+require("$CFG->dirroot/lib/setup.php");
+
+require_once($CFG->libdir.'/adminlib.php');
+require_once($CFG->libdir.'/upgradelib.php');
+require_once($CFG->libdir.'/clilib.php');
+require_once($CFG->libdir.'/installlib.php');
+require_once($CFG->libdir.'/testing/classes/test_lock.php');
+
+if ($unrecognized) {
+    $unrecognized = implode("\n  ", $unrecognized);
+    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
+}
+
+// Behat utilities.
+require_once($CFG->libdir . '/behat/classes/util.php');
+require_once($CFG->libdir . '/behat/classes/behat_command.php');
+
+// Run command (only one per time).
 if ($options['install']) {
-    echo "Acceptance tests site installed for sites:".PHP_EOL;
-
-    // Display all sites which are installed/drop/diabled.
-    for ($i = $options['fromrun']; $i <= $options['torun']; $i++) {
-        if (empty($CFG->behat_parallel_run[$i - 1]['behat_wwwroot'])) {
-            echo $CFG->behat_wwwroot . "/" . BEHAT_PARALLEL_SITE_NAME . $i . PHP_EOL;
-        } else {
-            echo $CFG->behat_parallel_run[$i - 1]['behat_wwwroot'] . PHP_EOL;
-        }
-
-    }
+    behat_util::install_site();
+    mtrace("Acceptance tests site installed");
 } else if ($options['drop']) {
-    echo "Acceptance tests site dropped for " . $options['parallel'] . " parallel sites" . PHP_EOL;
-
+    // Ensure no tests are running.
+    test_lock::acquire('behat');
+    behat_util::drop_site();
+    mtrace("Acceptance tests site dropped");
 } else if ($options['enable']) {
-    echo "Acceptance tests environment enabled on $CFG->behat_wwwroot, to run the tests use:" . PHP_EOL;
-    echo behat_command::get_behat_command(true, true);
-    echo PHP_EOL;
-
+    behat_util::start_test_mode();
+    $runtestscommand = behat_command::get_behat_command(true) .
+        ' --config ' . behat_config_manager::get_behat_cli_config_filepath();
+    mtrace("Acceptance tests environment enabled, to run the tests use:\n " . $runtestscommand);
 } else if ($options['disable']) {
-    echo "Acceptance tests environment disabled for " . $options['parallel'] . " parallel sites" . PHP_EOL;
-
+    behat_util::stop_test_mode();
+    mtrace("Acceptance tests environment disabled");
 } else if ($options['diag']) {
-    // Valid option, so nothing to do.
+    $code = behat_util::get_behat_status();
+    exit($code);
 } else {
     echo $help;
-    chdir($cwd);
-    exit(1);
 }
 
-chdir($cwd);
 exit(0);
-
-/**
- * Create commands to be executed for parallel run.
- *
- * @param array $options options provided by user.
- * @return array commands to be executed.
- */
-function commands_to_execute($options) {
-    $removeoptions = array('maxruns', 'fromrun', 'torun');
-    $cmds = array();
-    $extraoptions = $options;
-    $extra = "";
-
-    // Remove extra options not in util_single_run.php.
-    foreach ($removeoptions as $ro) {
-        $extraoptions[$ro] = null;
-        unset($extraoptions[$ro]);
-    }
-
-    foreach ($extraoptions as $option => $value) {
-        if ($options[$option]) {
-            $extra .= " --$option";
-            if ($value) {
-                $extra .= "=$value";
-            }
-        }
-    }
-
-    if (empty($options['parallel'])) {
-        $cmds = "php util_single_run.php " . $extra;
-    } else {
-        // Create commands which has to be executed for parallel site.
-        for ($i = $options['fromrun']; $i <= $options['torun']; $i++) {
-            $prefix = BEHAT_PARALLEL_SITE_NAME . $i;
-            $cmds[$prefix] = "php util_single_run.php " . $extra . " --run=" . $i . " 2>&1";
-        }
-    }
-    return $cmds;
-}
-
-/**
- * Print drop output merging each run.
- *
- * @param array $processes list of processes.
- * @return array exit codes of each process.
- */
-function print_combined_drop_output($processes) {
-    $exitcodes = array();
-    $maxdotsonline = 70;
-    $remainingprintlen = $maxdotsonline;
-    $progresscount = 0;
-    echo "Dropping tables:" . PHP_EOL;
-
-    while (count($exitcodes) != count($processes)) {
-        usleep(10000);
-        foreach ($processes as $name => $process) {
-            if ($process->isRunning()) {
-                $op = $process->getIncrementalOutput();
-                if (trim($op)) {
-                    $update = preg_filter('#^\s*([FS\.\-]+)(?:\s+\d+)?\s*$#', '$1', $op);
-                    $strlentoprint = strlen($update);
-
-                    // If not enough dots printed on line then just print.
-                    if ($strlentoprint < $remainingprintlen) {
-                        echo $update;
-                        $remainingprintlen = $remainingprintlen - $strlentoprint;
-                    } else if ($strlentoprint == $remainingprintlen) {
-                        $progresscount += $maxdotsonline;
-                        echo $update . " " . $progresscount . PHP_EOL;
-                        $remainingprintlen = $maxdotsonline;
-                    } else {
-                        while ($part = substr($update, 0, $remainingprintlen) > 0) {
-                            $progresscount += $maxdotsonline;
-                            echo $part . " " . $progresscount . PHP_EOL;
-                            $update = substr($update, $remainingprintlen);
-                            $remainingprintlen = $maxdotsonline;
-                        }
-                    }
-                }
-            } else {
-                // Process exited.
-                $process->clearOutput();
-                $exitcodes[$name] = $process->getExitCode();
-            }
-        }
-    }
-
-    echo PHP_EOL;
-    return $exitcodes;
-}
-
-/**
- * Print install output merging each run.
- *
- * @param array $processes list of processes.
- * @return array exit codes of each process.
- */
-function print_combined_install_output($processes) {
-    $exitcodes = array();
-    $line = array();
-
-    // Check what best we can do to accommodate  all parallel run o/p on single line.
-    // Windows command line has length of 80 chars, so default we will try fit o/p in 80 chars.
-    if (defined('BEHAT_MAX_CMD_LINE_OUTPUT') && BEHAT_MAX_CMD_LINE_OUTPUT) {
-        $lengthofprocessline = (int)max(10, BEHAT_MAX_CMD_LINE_OUTPUT / count($processes));
-    } else {
-        $lengthofprocessline = (int)max(10, 80 / count($processes));
-    }
-
-    echo "Installing behat site for " . count($processes) . " parallel behat run" . PHP_EOL;
-
-    // Show process name in first row.
-    foreach ($processes as $name => $process) {
-        // If we don't have enough space to show full run name then show runX.
-        if ($lengthofprocessline < strlen($name + 2)) {
-            $name = substr($name, -5);
-        }
-        // One extra padding as we are adding | separator for rest of the data.
-        $line[$name] = str_pad('[' . $name . '] ', $lengthofprocessline + 1);
-    }
-    ksort($line);
-    $tableheader = array_keys($line);
-    echo implode("", $line) . PHP_EOL;
-
-    // Now print o/p from each process.
-    while (count($exitcodes) != count($processes)) {
-        usleep(50000);
-        $poutput = array();
-        // Create child process.
-        foreach ($processes as $name => $process) {
-            if ($process->isRunning()) {
-                $output = $process->getIncrementalOutput();
-                if (trim($output)) {
-                    $poutput[$name] = explode(PHP_EOL, $output);
-                }
-            } else {
-                // Process exited.
-                $exitcodes[$name] = $process->getExitCode();
-            }
-        }
-        ksort($poutput);
-
-        // Get max depth of o/p before displaying.
-        $maxdepth = 0;
-        foreach ($poutput as $pout) {
-            $pdepth = count($pout);
-            $maxdepth = $pdepth >= $maxdepth ? $pdepth : $maxdepth;
-        }
-
-        // Iterate over each process to get line to print.
-        for ($i = 0; $i <= $maxdepth; $i++) {
-            $pline = "";
-            foreach ($tableheader as $name) {
-                $po = empty($poutput[$name][$i]) ? "" : substr($poutput[$name][$i], 0, $lengthofprocessline - 1);
-                $po = str_pad($po, $lengthofprocessline);
-                $pline .= "|". $po;
-            }
-            if (trim(str_replace("|", "", $pline))) {
-                echo $pline . PHP_EOL;
-            }
-        }
-        unset($poutput);
-        $poutput = null;
-
-    }
-    echo PHP_EOL;
-    return $exitcodes;
-}
-
-/**
- * Print install output merging showing one run at a time.
- * If any process fail then exit.
- *
- * @param array $processes list of processes.
- * @param bool $showprefix show prefix.
- * @return bool exitcode.
- */
-function print_sequential_output($processes, $showprefix = true) {
-    $status = false;
-    foreach ($processes as $name => $process) {
-        $shownname = false;
-        while ($process->isRunning()) {
-            $op = $process->getIncrementalOutput();
-            if (trim($op)) {
-                // Show name of the run once for sequential.
-                if ($showprefix && !$shownname) {
-                    echo '[' . $name . '] ';
-                    $shownname = true;
-                }
-                echo $op;
-            }
-        }
-        // If any error then exit.
-        $exitcode = $process->getExitCode();
-        if ($exitcode != 0) {
-            exit($exitcode);
-        }
-        $status = $status || (bool)$exitcode;
-    }
-    return $status;
-}

admin/tool/behat/cli/util_single_run.php

@@ -1,277 +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/>.
-
-/**
- * CLI tool with utilities to manage Behat integration in Moodle
- *
- * All CLI utilities uses $CFG->behat_dataroot and $CFG->prefix_dataroot as
- * $CFG->dataroot and $CFG->prefix
- *
- * @package    tool_behat
- * @copyright  2012 David Monllaó
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-
-if (isset($_SERVER['REMOTE_ADDR'])) {
-    die(); // No access from web!.
-}
-
-// Basic functions.
-require_once(__DIR__ . '/../../../../lib/clilib.php');
-require_once(__DIR__ . '/../../../../lib/behat/lib.php');
-
-// CLI options.
-list($options, $unrecognized) = cli_get_params(
-    array(
-        'help'        => false,
-        'install'     => false,
-        'parallel'    => 0,
-        'run'         => '',
-        'drop'        => false,
-        'enable'      => false,
-        'disable'     => false,
-        'diag'        => false,
-        'tags'        => '',
-        'updatesteps' => false,
-    ),
-    array(
-        'h' => 'help'
-    )
-);
-
-if ($options['install'] or $options['drop']) {
-    define('CACHE_DISABLE_ALL', true);
-}
-
-// Checking util_single_run.php CLI script usage.
-$help = "
-Behat utilities to manage the test environment
-
-Usage:
-  php util_single_run.php [--install|--drop|--enable|--disable|--diag|--updatesteps|--help]
-
-Options:
---install     Installs the test environment for acceptance tests
---drop        Drops the database tables and the dataroot contents
---enable      Enables test environment and updates tests list
---disable     Disables test environment
---diag        Get behat test environment status code
---updatesteps Update feature step file.
-
--h, --help Print out this help
-
-Example from Moodle root directory:
-\$ php admin/tool/behat/cli/util_single_run.php --enable
-
-More info in http://docs.moodle.org/dev/Acceptance_testing#Running_tests
-";
-
-if (!empty($options['help'])) {
-    echo $help;
-    exit(0);
-}
-
-// Describe this script.
-define('BEHAT_UTIL', true);
-define('CLI_SCRIPT', true);
-define('NO_OUTPUT_BUFFERING', true);
-define('IGNORE_COMPONENT_CACHE', true);
-
-// Set run value, to be used by setup for configuring proper CFG variables.
-if ($options['run']) {
-    define('BEHAT_CURRENT_RUN', $options['run']);
-}
-
-// Only load CFG from config.php, stop ASAP in lib/setup.php.
-define('ABORT_AFTER_CONFIG', true);
-require_once(__DIR__ . '/../../../../config.php');
-
-// Remove error handling overrides done in config.php.
-$CFG->debug = (E_ALL | E_STRICT);
-$CFG->debugdisplay = 1;
-error_reporting($CFG->debug);
-ini_set('display_errors', '1');
-ini_set('log_errors', '1');
-
-// Finish moodle init.
-define('ABORT_AFTER_CONFIG_CANCEL', true);
-require("$CFG->dirroot/lib/setup.php");
-
-raise_memory_limit(MEMORY_HUGE);
-
-require_once($CFG->libdir.'/adminlib.php');
-require_once($CFG->libdir.'/upgradelib.php');
-require_once($CFG->libdir.'/clilib.php');
-require_once($CFG->libdir.'/installlib.php');
-require_once($CFG->libdir.'/testing/classes/test_lock.php');
-
-if ($unrecognized) {
-    $unrecognized = implode(PHP_EOL . "  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-// Behat utilities.
-require_once($CFG->libdir . '/behat/classes/util.php');
-require_once($CFG->libdir . '/behat/classes/behat_command.php');
-require_once($CFG->libdir . '/behat/classes/behat_config_manager.php');
-
-// Ensure run option is <= parallel run installed.
-if ($options['run']) {
-    if (!$options['parallel']) {
-        $options['parallel'] = behat_config_manager::get_parallel_test_runs();
-    }
-    if (empty($options['parallel']) || $options['run'] > $options['parallel']) {
-        echo "Parallel runs can't be more then ".$options['parallel'].PHP_EOL;
-        exit(1);
-    }
-    $CFG->behatrunprocess = $options['run'];
-}
-
-// Run command (only one per time).
-if ($options['install']) {
-    behat_util::install_site();
-
-    // This is only displayed once for parallel install.
-    if (empty($options['run'])) {
-        mtrace("Acceptance tests site installed");
-    }
-
-} else if ($options['drop']) {
-    // Ensure no tests are running.
-    test_lock::acquire('behat');
-    behat_util::drop_site();
-    // This is only displayed once for parallel install.
-    if (empty($options['run'])) {
-        mtrace("Acceptance tests site dropped");
-    }
-
-} else if ($options['enable']) {
-    if (!empty($options['parallel'])) {
-        // Save parallel site info for enable and install options.
-        $filepath = behat_config_manager::get_parallel_test_file_path();
-        if (!file_put_contents($filepath, $options['parallel'])) {
-            behat_error(BEHAT_EXITCODE_PERMISSIONS, 'File ' . $filepath . ' can not be created');
-        }
-    }
-
-    // Enable test mode.
-    behat_util::start_test_mode();
-
-    // This is only displayed once for parallel install.
-    if (empty($options['run'])) {
-        $runtestscommand = behat_command::get_behat_command(true, !empty($options['run']));
-
-        $runtestscommand .= ' --config ' . behat_config_manager::get_behat_cli_config_filepath();
-        mtrace("Acceptance tests environment enabled on $CFG->behat_wwwroot, to run the tests use: " . PHP_EOL .
-            $runtestscommand);
-    }
-
-} else if ($options['disable']) {
-    behat_util::stop_test_mode();
-    // This is only displayed once for parallel install.
-    if (empty($options['run'])) {
-        mtrace("Acceptance tests environment disabled");
-    }
-
-} else if ($options['diag']) {
-    $code = behat_util::get_behat_status();
-    exit($code);
-
-} else if ($options['updatesteps']) {
-    if (defined('BEHAT_FEATURE_STEP_FILE') && BEHAT_FEATURE_STEP_FILE) {
-        $behatstepfile = BEHAT_FEATURE_STEP_FILE;
-    } else {
-        echo "BEHAT_FEATURE_STEP_FILE is not set, please ensure you set this to writable file" . PHP_EOL;
-        exit(1);
-    }
-
-    // Run behat command to get steps in feature files.
-    $featurestepscmd = behat_command::get_behat_command(true);
-    $featurestepscmd .= ' --config ' . behat_config_manager::get_behat_cli_config_filepath();
-    $featurestepscmd .= ' --dry-run --format=moodle_step_count';
-    $processes = cli_execute_parallel(array($featurestepscmd), __DIR__ . "/../../../../");
-    $status = print_update_step_output(array_pop($processes), $behatstepfile);
-
-    exit($status);
-} else {
-    echo $help;
-    exit(1);
-}
-
-exit(0);
-
-/**
- * Print update progress as dots for updating feature file step list.
- *
- * @param Process $process process executing update step command.
- * @param string $featurestepfile feature step file in which steps will be saved.
- * @return int exitcode.
- */
-function print_update_step_output($process, $featurestepfile) {
-    $printedlength = 0;
-
-    echo "Updating steps feature file for parallel behat runs" . PHP_EOL;
-
-    // Show progress while running command.
-    while ($process->isRunning()) {
-        usleep(10000);
-        $op = $process->getIncrementalOutput();
-        if (trim($op)) {
-            echo ".";
-            $printedlength++;
-            if ($printedlength > 70) {
-                $printedlength = 0;
-                echo PHP_EOL;
-            }
-        }
-    }
-
-    // If any error then exit.
-    $exitcode = $process->getExitCode();
-    // Output err.
-    if ($exitcode != 0) {
-        echo $process->getErrorOutput();
-        exit($exitcode);
-    }
-
-    // Extract features with step info and save it in file.
-    $featuresteps = $process->getOutput();
-    $featuresteps = explode(PHP_EOL, $featuresteps);
-
-    $realroot = realpath(__DIR__.'/../../../../').'/';
-    foreach ($featuresteps as $featurestep) {
-        if (trim($featurestep)) {
-            $step = explode("::", $featurestep);
-            $step[0] = str_replace($realroot, '', $step[0]);
-            $steps[$step[0]] = $step[1];
-        }
-    }
-
-    if ($existing = @json_decode(file_get_contents($featurestepfile), true)) {
-        $steps = array_merge($existing, $steps);
-    }
-    arsort($steps);
-
-    if (!@file_put_contents($featurestepfile, json_encode($steps, JSON_PRETTY_PRINT))) {
-        behat_error(BEHAT_EXITCODE_PERMISSIONS, 'File ' . $featurestepfile . ' can not be created');
-        $exitcode = -1;
-    }
-
-    echo PHP_EOL. "Updated step count in " . $featurestepfile . PHP_EOL;
-
-    return $exitcode;
-}

admin/tool/behat/index.php

@@ -27,11 +27,6 @@ require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->dirroot . '/' . $CFG->admin . '/tool/behat/locallib.php');
 require_once($CFG->libdir . '/behat/classes/behat_config_manager.php');
 
-// This page usually takes an exceedingly long time to load, so we need to
-// increase the time limit. At present it takes about a minute on some
-// systems, but let's allow room for expansion.
-core_php_time_limit::raise(300);
-
 $filter = optional_param('filter', '', PARAM_ALPHANUMEXT);
 $type = optional_param('type', false, PARAM_ALPHAEXT);
 $component = optional_param('component', '', PARAM_ALPHAEXT);

admin/tool/behat/lang/en/tool_behat.php

@@ -22,22 +22,17 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['aim'] = 'This administration tool helps developers and test writers to create .feature files describing Moodle\'s functionalities and run them automatically. Step definitions available for use in .feature files are listed below.';
+$string['aim'] = 'This administration tool helps developers and test writers to create .feature files describing Moodle\'s functionalities and run them automatically.';
 $string['allavailablesteps'] = 'All the available steps definitions';
-$string['errorbehatcommand'] = 'Error running behat CLI command. Try running "{$a} --help" manually from CLI to find out more about the problem.';
-$string['errorcomposer'] = 'Composer dependencies are not installed.';
-$string['errordataroot'] = '$CFG->behat_dataroot is not set or is invalid.';
-$string['errorsetconfig'] = '$CFG->behat_dataroot, $CFG->behat_prefix and $CFG->behat_wwwroot need to be set in config.php.';
-$string['erroruniqueconfig'] = '$CFG->behat_dataroot, $CFG->behat_prefix and $CFG->behat_wwwroot values need to be different than $CFG->dataroot, $CFG->prefix, $CFG->wwwroot, $CFG->phpunit_dataroot and $CFG->phpunit_prefix values.';
-$string['fieldvalueargument'] = 'Field value arguments';
-$string['fieldvalueargument_help'] = 'This argument should be completed by a field value, there are many field types, simple ones like checkboxes, selects or textareas or complex ones like date selectors. You can check <a href="http://docs.moodle.org/dev/Acceptance_testing#Providing_values_to_steps" target="_blank">Field values</a> to see the expected field value depending on the field type you provide.';
 $string['giveninfo'] = 'Given. Processes to set up the environment';
 $string['infoheading'] = 'Info';
 $string['installinfo'] = 'Read {$a} for installation and tests execution info';
+$string['moreinfoin'] = 'More info in {$a}';
 $string['newstepsinfo'] = 'Read {$a} for info about how to add new steps definitions';
 $string['newtestsinfo'] = 'Read {$a} for info about how to write new tests';
 $string['nostepsdefinitions'] = 'There aren\'t steps definitions matching this filters';
 $string['pluginname'] = 'Acceptance testing';
+$string['runclitool'] = 'To list the steps definitions you need to run the Behat CLI tool to create the $CFG->behat_dataroot directory. Go to your moodle dirroot and run "{$a}"';
 $string['stepsdefinitionscomponent'] = 'Area';
 $string['stepsdefinitionscontains'] = 'Contains';
 $string['stepsdefinitionsfilters'] = 'Steps definitions';
@@ -46,7 +41,6 @@ $string['theninfo'] = 'Then. Checkings to ensure the outcomes are the expected o
 $string['unknownexceptioninfo'] = 'There was a problem with Selenium or your browser. Please ensure you are using the latest version of Selenium. Error:';
 $string['viewsteps'] = 'Filter';
 $string['wheninfo'] = 'When. Actions that provokes an event';
-$string['wrongbehatsetup'] = 'Something is wrong with the behat setup and so step definitions cannot be listed: <b>{$a->errormsg}</b><br/><br/>Please check:<ul>
-<li>$CFG->behat_dataroot, $CFG->behat_prefix and $CFG->behat_wwwroot are set in config.php with different values from $CFG->dataroot, $CFG->prefix and $CFG->wwwroot.</li>
-<li>You ran "{$a->behatinit}" from your Moodle root directory.</li>
-<li>Dependencies are installed in vendor/ and {$a->behatcommand} file has execution permissions.</li></ul>';
+$string['wrongbehatsetup'] = 'Something is wrong with behat setup, ensure:<ul>
+<li>You ran "php admin/tool/behat/cli/init.php" from your moodle root directory</li>
+<li>vendor/bin/behat file has execution permissions</li></ul>';

admin/tool/behat/renderer.php

@@ -45,7 +45,37 @@ class tool_behat_renderer extends plugin_renderer_base {
      */
     public function render_stepsdefinitions($stepsdefinitions, $form) {
 
-        $html = $this->generic_info();
+        $title = get_string('pluginname', 'tool_behat');
+
+        // Header.
+        $html = $this->output->header();
+        $html .= $this->output->heading($title);
+
+        // Info.
+        $installurl = behat_command::DOCS_URL . '#Installation';
+        $installlink = html_writer::tag('a', $installurl, array('href' => $installurl, 'target' => '_blank'));
+        $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'));
+        $infos = array(
+            get_string('installinfo', 'tool_behat', $installlink),
+            get_string('newtestsinfo', 'tool_behat', $writetestslink),
+            get_string('newstepsinfo', 'tool_behat', $writestepslink)
+        );
+
+        // List of steps.
+        $html .= $this->output->box_start();
+        $html .= html_writer::tag('h1', get_string('infoheading', 'tool_behat'));
+        $html .= html_writer::tag('div', get_string('aim', 'tool_behat'));
+        $html .= html_writer::empty_tag('div');
+        $html .= html_writer::empty_tag('ul');
+        $html .= html_writer::empty_tag('li');
+        $html .= implode(html_writer::end_tag('li') . html_writer::empty_tag('li'), $infos);
+        $html .= html_writer::end_tag('li');
+        $html .= html_writer::end_tag('ul');
+        $html .= html_writer::end_tag('div');
+        $html .= $this->output->box_end();
 
         // Form.
         ob_start();
@@ -84,33 +114,6 @@ class tool_behat_renderer extends plugin_renderer_base {
                 $stepsdefinitions
             );
 
-            $stepsdefinitions = preg_replace_callback('/(FIELD_VALUE_STRING)/',
-                function ($matches) {
-                    global $CFG;
-
-                    // Creating a link to a popup with the help.
-                    $url = new moodle_url(
-                        '/help.php',
-                        array(
-                            'component' => 'tool_behat',
-                            'identifier' => 'fieldvalueargument',
-                            'lang' => current_language()
-                        )
-                    );
-
-                    // Note: this title is displayed only if JS is disabled,
-                    // otherwise the link will have the new ajax tooltip.
-                    $title = get_string('fieldvalueargument', 'tool_behat');
-                    $title = get_string('helpprefix2', '', trim($title, ". \t"));
-
-                    $attributes = array('href' => $url, 'title' => $title,
-                        'aria-haspopup' => 'true', 'target' => '_blank');
-
-                    $output = html_writer::tag('a', 'FIELD_VALUE_STRING', $attributes);
-                    return html_writer::tag('span', $output, array('class' => 'helptooltip'));
-                },
-                $stepsdefinitions
-            );
         }
 
         // Steps definitions.
@@ -120,75 +123,4 @@ class tool_behat_renderer extends plugin_renderer_base {
 
         return $html;
     }
-
-    /**
-     * Renders an error message adding the generic info about the tool purpose and setup.
-     *
-     * @param string $msg The error message
-     * @return string HTML
-     */
-    public function render_error($msg) {
-
-        $html = $this->generic_info();
-
-        $a = new stdClass();
-        $a->errormsg = $msg;
-        $a->behatcommand = behat_command::get_behat_command();
-        $a->behatinit = 'php admin' . DIRECTORY_SEPARATOR . 'tool' . DIRECTORY_SEPARATOR .
-            'behat' . DIRECTORY_SEPARATOR . 'cli' . DIRECTORY_SEPARATOR . 'init.php';
-
-        $msg = get_string('wrongbehatsetup', 'tool_behat', $a);
-
-        // Error box including generic error string + specific error msg.
-        $html .= $this->output->box_start('box errorbox');
-        $html .= html_writer::tag('div', $msg);
-        $html .= $this->output->box_end();
-
-        $html .= $this->output->footer();
-
-        return $html;
-    }
-
-    /**
-     * Generic info about the tool.
-     *
-     * @return string
-     */
-    protected function generic_info() {
-
-        $title = get_string('pluginname', 'tool_behat');
-
-        // Header.
-        $html = $this->output->header();
-        $html .= $this->output->heading($title);
-
-        // 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';
-        $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'));
-        $infos = array(
-            get_string('installinfo', 'tool_behat', $installlink),
-            get_string('newtestsinfo', 'tool_behat', $writetestslink),
-            get_string('newstepsinfo', 'tool_behat', $writestepslink)
-        );
-
-        // List of steps.
-        $html .= $this->output->box_start();
-        $html .= html_writer::tag('h3', get_string('infoheading', 'tool_behat'));
-        $html .= html_writer::tag('div', get_string('aim', 'tool_behat'));
-        $html .= html_writer::start_tag('div');
-        $html .= html_writer::start_tag('ul');
-        $html .= html_writer::start_tag('li');
-        $html .= implode(html_writer::end_tag('li') . html_writer::start_tag('li'), $infos);
-        $html .= html_writer::end_tag('li');
-        $html .= html_writer::end_tag('ul');
-        $html .= html_writer::end_tag('div');
-        $html .= $this->output->box_end();
-
-        return $html;
-    }
-
 }

admin/tool/behat/tests/behat/basic_actions.feature

@@ -7,11 +7,11 @@ Feature: Page contents assertions
   @javascript
   Scenario: Basic contents assertions
     Given I log in as "admin"
-    And I am on site homepage
+    And I am on homepage
     And I expand "Users" node
     And I follow "Groups"
     And I press "Create group"
-    And I set the following fields to these values:
+    And I fill the moodle form with:
       | Group name | I'm the name |
       | Group description | I'm the description |
     And I press "Save changes"
@@ -22,8 +22,8 @@ Feature: Page contents assertions
     Then I should see "I'm the description"
     And "Grouping" "select" in the "region-main" "region" should be visible
     And "Group" "select" should be visible
-    And "Activity report" "link" in the "Administration" "block" should not be visible
-    And "Event monitoring rules" "link" should not be visible
+    And "Messaging" "link" in the "Administration" "block" should not be visible
+    And "Change password" "link" should not be visible
     And I should see "Filter groups by"
     And I should not see "Filter groupssss by"
     And I should see "Group members" in the "#region-main table th.c1" "css_element"
@@ -34,21 +34,20 @@ Feature: Page contents assertions
 
   @javascript
   Scenario: Locators inside specific DOM nodes using CSS selectors
-    Given the following "courses" exist:
+    Given the following "courses" exists:
       | fullname | shortname | category |
       | Course 1 | C1 | 0 |
     And I log in as "admin"
-    And I am on site homepage
     And I follow "Course 1"
     When I dock "Administration" block
-    Then I should not see "Question bank" in the ".block-region" "css_element"
+    Then I should not see "Question bank" in the "region-pre" "region"
     And I click on "//div[@id='dock']/descendant::h2[normalize-space(.)='Administration']" "xpath_element"
 
   @javascript
   Scenario: Locators inside specific DOM nodes using XPath
-    Given the following "courses" exist:
+    Given the following "courses" exists:
       | fullname | shortname | category |
       | Course 1 | C1 | 0 |
     And I log in as "admin"
     When I dock "Administration" block
-    Then I should not see "Turn editing on" in the ".block-region" "css_element"
+    Then I should not see "Turn editing on" in the "region-pre" "region"

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

@@ -5,7 +5,7 @@ Feature: Set up contextual data for tests
   I need to fill the database with fixtures
 
   Scenario: Add a bunch of users
-    Given the following "users" exist:
+    Given the following "users" exists:
       | username  | password  | firstname | lastname |
       | testuser  | testuser  |  |  |
       | testuser2 | testuser2 | TestFirstname | TestLastname |
@@ -16,18 +16,17 @@ Feature: Set up contextual data for tests
 
   @javascript
   Scenario: Add a bunch of courses and categories
-    Given the following "categories" exist:
+    Given the following "categories" exists:
       | name | category | idnumber |
       | Cat 1 | 0 | CAT1 |
       | Cat 2 | CAT1 | CAT2 |
       | Cat 3 | CAT1 | CAT3 |
-    And the following "courses" exist:
+    And the following "courses" exists:
       | fullname | shortname | category |
       | Course 1 | COURSE1 | CAT3 |
       | Course 2 | COURSE2 | CAT3 |
       | Course 3 | COURSE3 | 0 |
     When I log in as "admin"
-    And I am on site homepage
     Then I should see "Course 1"
     And I should see "Course 2"
     And I should see "Course 3"
@@ -45,19 +44,18 @@ Feature: Set up contextual data for tests
 
   @javascript
   Scenario: Add a bunch of groups and groupings
-    Given the following "courses" exist:
+    Given the following "courses" exists:
       | fullname | shortname |
       | Course 1 | C1 |
-    And the following "groups" exist:
+    And the following "groups" exists:
       | name | course | idnumber |
       | Group 1 | C1 | G1 |
       | Group 2 | C1 | G2 |
-    And the following "groupings" exist:
+    And the following "groupings" exists:
       | name | course | idnumber |
       | Grouping 1 | C1 | GG1 |
       | Grouping 2 | C1 | GG2 |
     When I log in as "admin"
-    And I am on site homepage
     And I follow "Course 1"
     And I expand "Users" node
     And I follow "Groups"
@@ -69,44 +67,43 @@ Feature: Set up contextual data for tests
 
   @javascript
   Scenario: Role overrides
-    Given the following "users" exist:
+    Given the following "users" exists:
       | username | firstname | lastname | email |
-      | teacher1 | Teacher | 1 | teacher1@example.com |
-      | student1 | Student | 1 | student1@example.com |
-    And the following "categories" exist:
+      | teacher1 | Teacher | 1 | teacher1@asd.com |
+      | student1 | Student | 1 | student1@asd.com |
+    And the following "categories" exists:
       | name | category | idnumber |
       | Cat 1 | 0 | CAT1 |
-    And the following "courses" exist:
+    And the following "courses" exists:
       | fullname | shortname |
       | Course 1 | C1 |
-    And the following "course enrolments" exist:
+    And the following "course enrolments" exists:
       | user | course | role |
       | student1 | C1 | student |
       | teacher1 | C1 | editingteacher |
-    And the following "permission overrides" exist:
+    And the following "permission overrides" exists:
       | capability | permission | role | contextlevel | reference |
       | mod/forum:editanypost | Allow | student | Course | C1 |
       | mod/forum:replynews | Prevent | editingteacher | Course | C1 |
     When I log in as "admin"
-    And I am on site homepage
     And I follow "Course 1"
     And I expand "Users" node
     And I follow "Permissions"
-    And I set the field "Advanced role override" to "Student (1)"
+    And I select "Student (1)" from "Advanced role override"
     Then "mod/forum:editanypost" capability has "Allow" permission
     And I press "Cancel"
-    And I set the field "Advanced role override" to "Teacher (1)"
+    And I select "Teacher (1)" from "Advanced role override"
     And "mod/forum:replynews" capability has "Prevent" permission
     And I press "Cancel"
 
   Scenario: Add course enrolments
-    Given the following "users" exist:
+    Given the following "users" exists:
       | username | firstname | lastname | email |
-      | student1 | Student | 1 | student1@example.com |
-    And the following "courses" exist:
+      | student1 | Student | 1 | student1@asd.com |
+    And the following "courses" exists:
       | fullname | shortname | format |
       | Course 1 | C1 | topics |
-    And the following "course enrolments" exist:
+    And the following "course enrolments" exists:
       | user | course | role |
       | student1 | C1 | student |
     When I log in as "student1"
@@ -114,62 +111,38 @@ Feature: Set up contextual data for tests
     Then I should see "Topic 1"
 
   Scenario: Add role assigns
-    Given the following "roles" exist:
-      | name                   | shortname | description      | archetype      |
-      | Custom editing teacher | custom1   | My custom role 1 | editingteacher |
-      | Custom student         | custom2   |                  |                |
-    And the following "users" exist:
+    Given the following "users" exists:
       | 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 |
-    And the following "categories" exist:
+      | user1 | User | 1 | user1@moodlemoodle.com |
+      | user2 | User | 2 | user2@moodlemoodle.com |
+      | user3 | User | 3 | user3@moodlemoodle.com |
+    And the following "categories" exists:
       | name | category | idnumber |
       | Cat 1 | 0 | CAT1 |
-    And the following "courses" exist:
+    And the following "courses" exists:
       | fullname | shortname | category |
       | Course 1 | C1 | CAT1 |
-    And the following "course enrolments" exist:
-      | user | course | role |
-      | user4 | C1 | custom1 |
-    And the following "role assigns" exist:
+    And the following "role assigns" exists:
       | user  | role           | contextlevel | reference |
       | user1 | manager        | System       |           |
       | user2 | editingteacher | Category     | CAT1      |
       | user3 | editingteacher | Course       | C1        |
-      | user5 | custom2        | System       |           |
     When I log in as "user1"
-    And I am on site homepage
     Then I should see "Front page settings"
     And I log out
     And I log in as "user2"
-    And I am on site homepage
     And I follow "Course 1"
     And I should see "Turn editing on"
     And I log out
     And I log in as "user3"
-    And I am on site homepage
     And I follow "Course 1"
     And I should see "Turn editing on"
-    And I log out
-    And I log in as "user4"
-    And I am on site homepage
-    And I follow "Course 1"
-    And I should see "Turn editing on"
-    And I log out
-    And I log in as "user5"
-    And I should see "You are logged in as"
-    And I am on site homepage
-    And I follow "Course 1"
-    And I should see "You can not enrol yourself in this course."
 
   Scenario: Add modules
-    Given the following "courses" exist:
+    Given the following "courses" exists:
       | fullname | shortname |
       | Course 1 | C1 |
-    And the following "activities" exist:
+    And the following "activities" exists:
       | activity   | name                   | intro                         | course | idnumber    |
       | assign     | Test assignment name   | Test assignment description   | C1     | assign1     |
       | assignment | Test assignment22 name | Test assignment22 description | C1     | assignment1 |
@@ -193,14 +166,7 @@ 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 am on site homepage
     And I follow "Course 1"
     Then I should see "Test assignment name"
     # Assignment 2.2 module type is disabled by default
@@ -229,215 +195,41 @@ 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:
+    Given the following "users" exists:
       | username | firstname | lastname | email |
-      | student1 | Student | 1 | student1@example.com |
-      | student2 | Student | 2 | student2@example.com |
-    And the following "courses" exist:
+      | student1 | Student | 1 | student1@asd.com |
+      | student2 | Student | 2 | student2@asd.com |
+    And the following "courses" exists:
       | fullname | shortname |
       | Course 1 | C1 |
-    And the following "groups" exist:
+    And the following "groups" exists:
       | name | course | idnumber |
       | Group 1 | C1 | G1 |
       | Group 2 | C1 | G2 |
-    And the following "groupings" exist:
+    And the following "groupings" exists:
       | name | course | idnumber |
       | Grouping 1 | C1 | GG1 |
-    And the following "course enrolments" exist:
+    And the following "course enrolments" exists:
       | user | course | role |
       | student1 | C1 | student |
       | student2 | C1 | student |
-    And the following "group members" exist:
+    And the following "group members" exists:
       | user | group |
       | student1 | G1 |
       | student2 | G2 |
-    And the following "grouping groups" exist:
+    And the following "grouping groups" exists:
       | grouping | group |
       | GG1 | G1 |
     When I log in as "admin"
-    And I am on site homepage
     And I follow "Course 1"
     And I expand "Users" node
     And I follow "Groups"
     Then the "groups" select box should contain "Group 1 (1)"
     And the "groups" select box should contain "Group 2 (1)"
-    And I set the field "groups" to "Group 1 (1)"
+    And I select "Group 1 (1)" from "groups"
     And the "members" select box should contain "Student 1"
-    And I set the field "groups" to "Group 2 (1)"
+    And I select "Group 2 (1)" from "groups"
     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 am on site homepage
-    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 am on site homepage
-    And I follow "Course 1"
-    And I navigate to "Grades" node in "Course administration"
-    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 am on site homepage
-    And I follow "Course 1"
-    And I navigate to "Grades" node in "Course administration"
-    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 am on site homepage
-    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 am on site homepage
-    And I follow "Course 1"
-    And I navigate to "Grades" node in "Course administration"
-    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

@@ -5,16 +5,17 @@ Feature: Edit capabilities
   I need to allow/deny the existing capabilities at different levels
 
   Background:
-    Given the following "users" exist:
+    Given the following "users" exists:
       | username | firstname | lastname | email |
-      | teacher1 | Teacher | 1 | teacher1@example.com |
-    And the following "courses" exist:
+      | teacher1 | Teacher | 1 | teacher1@asd.com |
+    And the following "courses" exists:
       | fullname | shortname | category |
       | Course 1 | C1 | 0 |
-    And the following "course enrolments" exist:
+    And the following "course enrolments" exists:
       | 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"
@@ -38,12 +40,12 @@ Feature: Edit capabilities
       | mod/forum:deleteanypost | Prohibit |
       | mod/forum:editanypost | Prevent |
       | mod/forum:addquestion | Allow |
-    When I set the field "Advanced role override" to "Student (3)"
-    And I press "Go"
+    When I select "Student (3)" from "Advanced role override"
     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"
@@ -57,8 +59,7 @@ Feature: Edit capabilities
       | mod/forum:deleteanypost | Prohibit |
       | mod/forum:editanypost | Prevent |
       | mod/forum:addquestion | Allow |
-    When I set the field "Advanced role override" to "Student (3)"
-    And I press "Go"
+    When I select "Student (3)" from "Advanced role override"
     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

@@ -5,41 +5,41 @@ Feature: Verify that all form fields values can be get and set
   I need to verify it all works in real moodle forms
 
   Background:
-    Given the following "courses" exist:
+    Given the following "courses" exists:
       | fullname | shortname | category |
       | Course 1 | C1 | 0 |
-    And the following "users" exist:
+    And the following "users" exists:
       | username | email | firstname | lastname |
-      | student1 | s1@example.com | Student | 1 |
-      | student2 | s2@example.com | Student | 2 |
-      | student3 | s3@example.com | Student | 3 |
-    And the following "course enrolments" exist:
+      | student1 | s1@asd.com | Student | 1 |
+      | student2 | s2@asd.com | Student | 2 |
+      | student3 | s3@asd.com | Student | 3 |
+    And the following "course enrolments" exists:
       | user | course | role |
       | student1 | C1 | student |
       | student2 | C1 | student |
       | student3 | C1 | student |
       | admin | C1 | editingteacher |
-    And the following "groups" exist:
+    And the following "groups" exists:
       | name | description | course | idnumber |
       | Group 1 | G1 description | C1 | G1 |
       | Group 2 | G1 description | C1 | G2 |
-    And the following "group members" exist:
+    And the following "group members" exists:
       | user | group |
       | student1 | G1 |
       | student2 | G1 |
       | student2 | G2 |
       | student3 | G2 |
-    And the following "activities" exist:
+    And the following "activities" exists:
       | activity | course | idnumber | name | intro | firstpagetitle | wikimode | visible |
       | wiki | C1 | wiki1 | Test this one | Test this one | Test this one | collaborative | 0 |
     And I log in as "admin"
     And I expand "Site administration" node
     And I expand "Appearance" node
     And I follow "Manage tags"
-    # Select (multi-select) - We will check "I set the field...".
-    And I set the field "otagsadd" to "OT1, OT2, OT3, OT4, OT5"
+    # Select (multi-select) - We will check "I fill in...".
+    And I fill in "otagsadd" with "OT1, OT2, OT3, OT4, OT5"
     And I press "Add official tags"
-    And I am on site homepage
+    And I am on homepage
     And I follow "Course 1"
     And I turn editing mode on
     And I follow "Test this one"
@@ -55,8 +55,8 @@ Feature: Verify that all form fields values can be get and set
     And the "tags[officialtags][]" select box should not contain "OT6"
     And the "tags[officialtags][]" select box should not contain "OT7"
     And the "tags[officialtags][]" select box should not contain "OT6, OT7"
-    # Text (textarea & editor) & Select (multi-select) - Checking "I set the following fields to these values".
-    When I set the following fields to these values:
+    # Text (textarea & editor) & Select (multi-select) - Checking "I fill the moodle form with".
+    When I fill the moodle form with:
       | HTML format | Student page contents to be tagged |
       | tags[officialtags][] | OT1, OT3, OT5 |
     And I press "Save"
@@ -67,8 +67,8 @@ Feature: Verify that all form fields values can be get and set
     And I should not see "OT2" in the ".wiki-tags" "css_element"
     And I should not see "OT4" in the ".wiki-tags" "css_element"
     And I follow "Edit"
-    # Select (multi-select) - Checking "I set the field".
-    And I set the field "tags[officialtags][]" to "OT2, OT4"
+    # Select (multi-select) - Checking "I select from".
+    And I select "OT2, OT4" from "tags[officialtags][]"
     And I press "Save"
     And I should see "OT2" in the ".wiki-tags" "css_element"
     And I should see "OT4" in the ".wiki-tags" "css_element"
@@ -76,40 +76,40 @@ Feature: Verify that all form fields values can be get and set
     And I should not see "OT3" in the ".wiki-tags" "css_element"
     And I should not see "OT5" in the ".wiki-tags" "css_element"
     And I follow "Edit"
-    # Select (multi-select) - Checking "the field matches value" and "the field does not match value".
-    And the field "tags[officialtags][]" matches value "OT2, OT4"
+    # Select (multi-select) - Checking "the field should match" and "the field does not match value".
+    And the "tags[officialtags][]" field should match "OT2, OT4" value
     And the field "tags[officialtags][]" does not match value "OT4"
     And the field "tags[officialtags][]" does not match value "OT2"
     And the field "tags[officialtags][]" does not match value "OT1, OT3, OT5"
     And I press "Cancel"
     And I follow "Edit settings"
     And I expand all fieldsets
-    # Checkbox - Checking "I set the field".
-    And I set the field "Display description on course page" to "1"
-    # Checkbox - Checking "I set the following fields to these values:".
-    And I set the following fields to these values:
+    # Checkbox - Checking "I check".
+    And I check "Display description on course page"
+    # Checkbox - Checking "I fill the moodle form with:".
+    And I fill the moodle form with:
       | Force format | 1 |
-    # Checkbox - Checking "the field matches value" and "the field does not match value".
-    And the field "Display description on course page" matches value "1"
+    # Checkbox - Checking "the field should match" and "the field does not match value".
+    And the "Display description on course page" field should match "1" value
     And the field "Display description on course page" does not match value ""
     And I press "Save and return to course"
     And I should see "Test this one"
     And I follow "Test this one"
     And I follow "Edit settings"
-    # Checkbox - Checking "the field matches value" and "the following fields match these values".
+    # Checkbox - Checking "the field should match" and "the following fields match these values".
     And the following fields match these values:
       | Display description on course page | 1 |
       | Default format | HTML |
       | Wiki name | Test this one |
-    And the field "Force format" matches value "1"
-    # Select (simple) - Checking "I set the following fields to these values:".
-    And I set the following fields to these values:
+    And the "Force format" field should match "1" value
+    # Select (simple) - Checking "I fill the moodle form with:".
+    And I fill the moodle form with:
       | Default format | NWiki |
       | Display description on course page | |
-    # Checkbox - Checking "I set the field" to uncheck.
-    And I set the field "Force format" to ""
-    # Select (simple) - Checking "I set the field".
-    And I set the field "Group mode" to "Separate groups"
+    # Checkbox - Checking "I uncheck".
+    And I uncheck "Force format"
+    # Select (simple) - Checking "I select from".
+    And I select "Separate groups" from "Group mode"
     And I press "Save and display"
     And I follow "Edit settings"
     And the following fields match these values:
@@ -124,7 +124,7 @@ Feature: Verify that all form fields values can be get and set
       | Force format | 1 |
     And I press "Cancel"
     And I follow "Course 1"
-    # Radio - Checking "I set the field" and "the field matches value".
+    # Radio - Checking "I check" and "the field should match".
     And I add a "Choice" to section "1" and I fill the form with:
       | Choice name | Test choice name |
       | Description | Test choice description |
@@ -133,10 +133,10 @@ Feature: Verify that all form fields values can be get and set
       | Option 2 | two |
       | Option 3 | three |
     And I follow "Test choice name"
-    And I set the field "one" to "1"
+    And I check "one"
     And I press "Save my choice"
-    And the field "one" matches value "1"
-    And the field "two" matches value ""
+    And the "one" field should match "1" value
+    And the "two" field should match "" value
 
   Scenario: with JS disabled all form fields getters and setters works as expected
 
@@ -145,30 +145,29 @@ Feature: Verify that all form fields values can be get and set
     Then I follow "Course 1"
     And I expand "Users" node
     And I follow "Groups"
-    # Select (multi-select & AJAX) - Checking "I set the field" and "select box should contain".
-    And I set the field "groups" to "Group 2"
+    # Select (multi-select & AJAX) - Checking "I select from" and "select box should contain".
+    And I select "Group 2" from "groups"
     And the "members" select box should contain "Student 2"
     And the "members" select box should contain "Student 3"
     And the "members" select box should not contain "Student 1"
-    And I set the field "groups" to "Group 1"
+    And I select "Group 1" from "groups"
     And the "members" select box should contain "Student 1"
     And the "members" select box should contain "Student 2"
     And the "members" select box should not contain "Student 3"
-    # Checkbox (AJAX) - Checking "I set the field" and "I set the following fields to these values".
+    # Checkbox (AJAX) - Checking "I check" and "I fill the moodle form with".
     And I follow "Course 1"
     And I add a "Lesson" to section "1"
-    And I set the following fields to these values:
+    And I fill the moodle form with:
       | 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.
-    And the field "available[enabled]" matches value "1"
+    And I check "deadline[enabled]"
+    # Checkbox (AJAX) - Checking "field should match" before saving.
+    And the "available[enabled]" field should match "1" value
     And the "available[day]" "field" should be enabled
-    And the field "deadline[enabled]" matches value "1"
+    And the "deadline[enabled]" field should match "1" value
     And I press "Save and display"
     And I follow "Edit settings"
-    And the field "available[enabled]" matches value "1"
+    And the "available[enabled]" field should match "1" value
     And the "available[day]" "field" should be enabled
-    And the field "deadline[enabled]" matches value "1"
+    And the "deadline[enabled]" field should match "1" value
     And I press "Cancel"

admin/tool/behat/tests/behat/list_steps.feature

@@ -7,7 +7,9 @@ Feature: List the system steps definitions
   Background:
     Given I am on homepage
     And I log in as "admin"
-    And I navigate to "Acceptance testing" node in "Site administration > Development"
+    And I expand "Site administration" node
+    And I expand "Development" node
+    And  I follow "Acceptance testing"
 
   @javascript
   Scenario: Accessing the list
@@ -16,14 +18,14 @@ Feature: List the system steps definitions
 
   @javascript
   Scenario: Filtering by type
-    Given I set the field "Type" to "Then. Checkings to ensure the outcomes are the expected ones"
+    Given I select "Then. Checkings to ensure the outcomes are the expected ones" from "Type"
     When I press "Filter"
     Then I should see "Checks, that page contains specified text."
     And I should not see "Opens Moodle homepage."
 
   @javascript
   Scenario: Filtering by keyword
-    Given I set the field "Contains" to "homepage"
+    Given I fill in "Contains" with "homepage"
     When I press "Filter"
     Then I should see "Opens Moodle homepage."
 

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

@@ -7,26 +7,24 @@ Feature: Forms manipulation
   @javascript
   Scenario: Basic forms manipulation
     Given I log in as "admin"
-    And I follow "Preferences" in the user menu
+    And I follow "Admin User"
     And I follow "Edit profile"
-    When I set the field "First name" to "Field value"
-    And I set the field "Select a country" to "Japan"
-    And I set the field "Unmask" to "1"
-    And I expand all fieldsets
-    Then the field "First name" matches value "Field value"
-    And the "Select a country" select box should contain "Japan"
-    And the field "Unmask" matches value "1"
-    And I set the field "Unmask" to ""
-    And the field "Unmask" matches value ""
+    When I fill in "First name" with "Field value"
+    And I select "Plain text area" from "Text editor"
+    And I check "Unmask"
+    Then the "First name" field should match "Field value" value
+    And the "Text editor" select box should contain "Plain text area"
+    And the "Unmask" checkbox should be checked
+    And I uncheck "Unmask"
+    And the "Unmask" checkbox should not be checked
     And I press "Update profile"
 
   @javascript
   Scenario: Expand all fieldsets and advanced elements
-    Given the following "courses" exist:
+    Given the following "courses" exists:
       | fullname | shortname | category |
       | Course 1 | C1 | 0 |
     And I log in as "admin"
-    And I am on site homepage
     And I follow "Course 1"
     And I turn editing mode on
     And I add a "Quiz" to section "1"

admin/tool/behat/tests/behat/nasty_strings.feature

@@ -5,55 +5,56 @@ Feature: Transform steps arguments
   I need to apply some transformations to the steps arguments
 
   Background:
-    Given I am on site homepage
-    And the following "courses" exist:
+    Given I am on homepage
+    And the following "courses" exists:
       | fullname | shortname | category |
       | Course 1 | C1 | 0 |
     And I log in as "admin"
-    And I follow "Preferences" in the user menu
+    And I follow "Admin User"
     And I follow "Edit profile"
 
   Scenario: Use nasty strings on steps arguments
-    When I set the field "Surname" to "$NASTYSTRING1"
-    And I set the field "Description" to "$NASTYSTRING2"
-    And I set the field "City/town" to "$NASTYSTRING3"
+    When I fill in "Surname" with "$NASTYSTRING1"
+    And I fill in "Description" with "$NASTYSTRING2"
+    And I fill in "City/town" with "$NASTYSTRING3"
     And I press "Update profile"
     And I follow "Edit profile"
     Then I should not see "NASTYSTRING"
-    And the field "Surname" matches value "$NASTYSTRING1"
-    And the field "City/town" matches value "$NASTYSTRING3"
+    And the "Surname" field should match "$NASTYSTRING1" value
+    And the "City/town" field should match "$NASTYSTRING3" value
 
   Scenario: Use nasty strings on table nodes
-    When I set the following fields to these values:
+    When I fill the moodle form with:
       | Surname | $NASTYSTRING1 |
       | Description | $NASTYSTRING2 |
       | City/town | $NASTYSTRING3 |
     And I press "Update profile"
     And I follow "Edit profile"
     Then I should not see "NASTYSTRING"
-    And the field "Surname" matches value "$NASTYSTRING1"
-    And the field "City/town" matches value "$NASTYSTRING3"
+    And the "Surname" field should match "$NASTYSTRING1" value
+    And the "City/town" field should match "$NASTYSTRING3" value
 
   Scenario: Use double quotes
-    When I set the following fields to these values:
+    When I fill the moodle form with:
       | First name | va"lue1 |
       | Description | va\"lue2 |
-    And I set the field "City/town" to "va\"lue3"
+    And I fill in "City/town" with "va\"lue3"
     And I press "Update profile"
     And I follow "Edit profile"
     Then I should not see "NASTYSTRING"
-    And the field "First name" matches value "va\"lue1"
-    And the field "Description" matches value "va\\"lue2"
-    And the field "City/town" matches value "va\"lue3"
+    And the "First name" field should match "va\"lue1" value
+    And the "Description" field should match "va\\"lue2" value
+    And the "City/town" field should match "va\"lue3" value
 
+  @javascript
   Scenario: Nasty strings with other contents
-    When I set the field "First name" to "My Firstname $NASTYSTRING1"
-    And I set the following fields to these values:
+    When I fill in "First name" with "My Firstname $NASTYSTRING1"
+    And I fill the moodle form with:
       | Surname | My Surname $NASTYSTRING2 |
     And I press "Update profile"
     And I follow "Edit profile"
     Then I should not see "NASTYSTRING"
     And I should see "My Firstname"
     And I should see "My Surname"
-    And the field "First name" matches value "My Firstname $NASTYSTRING1"
-    And the field "Surname" matches value "My Surname $NASTYSTRING2"
+    And the "First name" field should match "My Firstname $NASTYSTRING1" value
+    And the "Surname" field should match "My Surname $NASTYSTRING2" value

admin/tool/behat/tests/behat/test_environment.feature

@@ -5,5 +5,5 @@ Feature: Set up the testing environment
   I need to use the test environment instead of the regular environment
 
   Scenario: Accessing the site
-    When I am on site homepage
+    When I am on homepage
     Then I should see "Acceptance test site"

admin/tool/behat/tests/manager_test.php

@@ -1,193 +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/>.
-
-/**
- * Unit tests for behat manager.
- *
- * @package   tool_behat
- * @copyright  2012 David Monllaó
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-global $CFG;
-require_once($CFG->dirroot . '/' . $CFG->admin .'/tool/behat/locallib.php');
-require_once($CFG->libdir . '/behat/classes/util.php');
-require_once($CFG->libdir . '/behat/classes/behat_config_manager.php');
-
-/**
- * Behat manager tests.
- *
- * @package    tool_behat
- * @copyright  2012 David Monllaó
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class tool_behat_manager_testcase extends advanced_testcase {
-
-    /**
-     * behat_config_manager tests.
-     */
-    public function test_merge_configs() {
-
-        // Simple default config.
-        $array1 = array(
-            'the' => 'same',
-            'simple' => 'value',
-            'array' => array(
-                'one' => 'arrayvalue1',
-                'two' => 'arrayvalue2'
-            )
-        );
-
-        // Simple override.
-        $array2 = array(
-            'simple' => 'OVERRIDDEN1',
-            'array' => array(
-                'one' => 'OVERRIDDEN2'
-            ),
-            'newprofile' => array(
-                'anotherlevel' => array(
-                    'andanotherone' => array(
-                        'list1',
-                        'list2'
-                    )
-                )
-            )
-        );
-
-        $array = testable_behat_config_manager::merge_config($array1, $array2);
-
-        // Overrides are applied.
-        $this->assertEquals('OVERRIDDEN1', $array['simple']);
-        $this->assertEquals('OVERRIDDEN2', $array['array']['one']);
-
-        // Other values are respected.
-        $this->assertNotEmpty($array['array']['two']);
-
-        // Completely new nodes are added.
-        $this->assertNotEmpty($array['newprofile']);
-        $this->assertNotEmpty($array['newprofile']['anotherlevel']['andanotherone']);
-        $this->assertEquals('list1', $array['newprofile']['anotherlevel']['andanotherone'][0]);
-        $this->assertEquals('list2', $array['newprofile']['anotherlevel']['andanotherone'][1]);
-
-        // Complex override changing vectors to scalars and scalars to vectors.
-        $array2 = array(
-            'simple' => array(
-                'simple' => 'should',
-                'be' => 'overridden',
-                'by' => 'this-array'
-            ),
-            'array' => 'one'
-        );
-
-        $array = testable_behat_config_manager::merge_config($array1, $array2);
-
-        // Overrides applied.
-        $this->assertNotEmpty($array['simple']);
-        $this->assertNotEmpty($array['array']);
-        $this->assertTrue(is_array($array['simple']));
-        $this->assertFalse(is_array($array['array']));
-
-        // Other values are maintained.
-        $this->assertEquals('same', $array['the']);
-    }
-
-    /**
-     * behat_config_manager tests.
-     */
-    public function test_config_file_contents() {
-        global $CFG;
-
-        // Skip tests if behat is not installed.
-        $vendorpath = $CFG->dirroot . '/vendor';
-        if (!file_exists($vendorpath . '/autoload.php') || !is_dir($vendorpath . '/behat')) {
-            $this->markTestSkipped('Behat not installed.');
-        }
-
-        // Add some fake test url.
-        $CFG->behat_wwwroot = 'http://example.com/behat';
-
-        // To avoid user value at config.php level.
-        unset($CFG->behat_config);
-
-        // List.
-        $features = array(
-            'feature1',
-            'feature2',
-            'feature3'
-        );
-
-        // Associative array.
-        $stepsdefinitions = array(
-            'micarro' => '/me/lo/robaron',
-            'anoche' => '/cuando/yo/dormia'
-        );
-
-        $contents = testable_behat_config_manager::get_config_file_contents($features, $stepsdefinitions);
-
-        // YAML decides when is is necessary to wrap strings between single quotes, so not controlled
-        // values like paths should not be asserted including the key name as they would depend on the
-        // directories values.
-        $this->assertContains($CFG->dirroot . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'behat' . DIRECTORY_SEPARATOR . 'features', $contents);
-
-        // Not quoted strings.
-        $this->assertContains('micarro: /me/lo/robaron', $contents);
-        $this->assertContains('class: behat_init_context', $contents);
-
-        // YAML uses single quotes to wrap URL strings.
-        $this->assertContains("base_url: '" . $CFG->behat_wwwroot . "'", $contents);
-
-        // Lists.
-        $this->assertContains('- feature1', $contents);
-        $this->assertContains('- feature3', $contents);
-
-        unset($CFG->behat_wwwroot);
-    }
-
-}
-
-/**
- * Allows access to internal methods without exposing them.
- *
- * @package    tool_behat
- * @copyright  2012 David Monllaó
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class testable_behat_config_manager extends behat_config_manager {
-
-    /**
-     * Allow access to protected method
-     * @see parent::merge_config()
-     * @param mixed $config
-     * @param mixed $localconfig
-     * @return mixed
-     */
-    public static function merge_config($config, $localconfig) {
-        return parent::merge_config($config, $localconfig);
-    }
-
-    /**
-     * Allow access to protected method
-     * @see parent::get_config_file_contents()
-     * @param array $features
-     * @param array $stepsdefinitions
-     * @return string
-     */
-    public static function get_config_file_contents($features, $stepsdefinitions) {
-        return parent::get_config_file_contents($features, $stepsdefinitions);
-    }
-}

admin/tool/behat/tests/tool_behat_test.php

@@ -0,0 +1,194 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Unit tests for admin/tool/behat.
+ *
+ * @package   tool_behat
+ * @copyright  2012 David Monllaó
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+require_once($CFG->dirroot . '/' . $CFG->admin .'/tool/behat/locallib.php');
+require_once($CFG->libdir . '/behat/classes/util.php');
+require_once($CFG->libdir . '/behat/classes/behat_config_manager.php');
+
+/**
+ * Allows access to internal methods without exposing them.
+ *
+ * @package    tool_behat
+ * @copyright  2012 David Monllaó
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class testable_behat_config_manager extends behat_config_manager {
+
+    /**
+     * Allow access to protected method
+     * @see parent::merge_config()
+     * @param mixed $config
+     * @param mixed $localconfig
+     * @return mixed
+     */
+    public static function merge_config($config, $localconfig) {
+        return parent::merge_config($config, $localconfig);
+    }
+
+    /**
+     * Allow access to protected method
+     * @see parent::get_config_file_contents()
+     * @param array $features
+     * @param array $stepsdefinitions
+     * @return string
+     */
+    public static function get_config_file_contents($features, $stepsdefinitions) {
+        return parent::get_config_file_contents($features, $stepsdefinitions);
+    }
+}
+
+/**
+ * Tool behat tests.
+ *
+ * @package    tool_behat
+ * @copyright  2012 David Monllaó
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class tool_behat_testcase extends advanced_testcase {
+
+    /**
+     * behat_config_manager tests.
+     */
+    public function test_merge_configs() {
+
+        // Simple default config.
+        $array1 = array(
+            'the' => 'same',
+            'simple' => 'value',
+            'array' => array(
+                'one' => 'arrayvalue1',
+                'two' => 'arrayvalue2'
+            )
+        );
+
+        // Simple override.
+        $array2 = array(
+            'simple' => 'OVERRIDDEN1',
+            'array' => array(
+                'one' => 'OVERRIDDEN2'
+            ),
+            'newprofile' => array(
+                'anotherlevel' => array(
+                    'andanotherone' => array(
+                        'list1',
+                        'list2'
+                    )
+                )
+            )
+        );
+
+        $array = testable_behat_config_manager::merge_config($array1, $array2);
+
+        // Overriddes are applied.
+        $this->assertEquals('OVERRIDDEN1', $array['simple']);
+        $this->assertEquals('OVERRIDDEN2', $array['array']['one']);
+
+        // Other values are respected.
+        $this->assertNotEmpty($array['array']['two']);
+
+        // Completely new nodes are added.
+        $this->assertNotEmpty($array['newprofile']);
+        $this->assertNotEmpty($array['newprofile']['anotherlevel']['andanotherone']);
+        $this->assertEquals('list1', $array['newprofile']['anotherlevel']['andanotherone'][0]);
+        $this->assertEquals('list2', $array['newprofile']['anotherlevel']['andanotherone'][1]);
+
+        // Complex override changing vectors to scalars and scalars to vectors.
+        $array2 = array(
+            'simple' => array(
+                'simple' => 'should',
+                'be' => 'overridden',
+                'by' => 'this-array'
+            ),
+            'array' => 'one'
+        );
+
+        $array = testable_behat_config_manager::merge_config($array1, $array2);
+
+        // Overrides applied.
+        $this->assertNotEmpty($array['simple']);
+        $this->assertNotEmpty($array['array']);
+        $this->assertTrue(is_array($array['simple']));
+        $this->assertFalse(is_array($array['array']));
+
+        // Other values are maintained.
+        $this->assertEquals('same', $array['the']);
+    }
+
+    /**
+     * behat_config_manager tests.
+     */
+    public function test_config_file_contents() {
+        global $CFG;
+
+        // Skip tests if behat is not installed.
+        $vendorpath = $CFG->dirroot . '/vendor';
+        if (!file_exists($vendorpath . '/autoload.php') || !is_dir($vendorpath . '/behat')) {
+            $this->markTestSkipped('Behat not installed.');
+        }
+
+        // To avoid user value at config.php level.
+        unset($CFG->behat_config);
+
+        // List.
+        $features = array(
+            'feature1',
+            'feature2',
+            'feature3'
+        );
+
+        // Associative array.
+        $stepsdefinitions = array(
+            'micarro' => '/me/lo/robaron',
+            'anoche' => '/cuando/yo/dormia'
+        );
+
+        $contents = testable_behat_config_manager::get_config_file_contents($features, $stepsdefinitions);
+
+        // YAML decides when is is necessary to wrap strings between single quotes, so not controlled
+        // values like paths should not be asserted including the key name as they would depend on the
+        // directories values.
+        $this->assertContains($CFG->dirroot . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'behat' . DIRECTORY_SEPARATOR . 'features', $contents);
+
+        // If it was empty should be filled by behat_config_manager::get_config_file_contents().
+        $this->assertNotNull($CFG->behat_wwwroot);
+
+        // Not quoted strings.
+        $this->assertContains('micarro: /me/lo/robaron', $contents);
+        $this->assertContains('class: behat_init_context', $contents);
+
+        // YAML uses single quotes to wrap URL strings.
+        $this->assertContains("base_url: '" . $CFG->behat_wwwroot . "'", $contents);
+
+        // Lists.
+        $this->assertContains('- feature1', $contents);
+        $this->assertContains('- feature3', $contents);
+
+        unset($CFG->behat_wwwroot);
+    }
+
+}
+

admin/tool/behat/upgrade.txt

@@ -1,8 +0,0 @@
-This files describes API changes in the tool_behat code.
-
-=== 2.7 ===
-* Constants behat_base::cap_allow, behat_base::cap_prevent and
-  behat_base::cap_prohibit have been removed in favour of the
-  lang/en/role.php language strings 'allow', 'prevent' and 'prohibit'.
-* @_only_local tag used in .feature files replaced by @_file_upload tag
-* @_alerts tag used in .feature files replaced by @_alert tag

admin/tool/behat/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2015051100;   // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2015050500;   // Requires this Moodle version
-$plugin->component = 'tool_behat'; // Full name of the plugin (used for diagnostics)
+$plugin->version   = 2013110501;
+$plugin->requires  = 2013110500; // Requires Moodle 2.5.
+$plugin->component = 'tool_behat';

admin/tool/capability/classes/event/report_viewed.php

@@ -1,83 +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 tool_capability report viewed event.
- *
- * @package    tool_capability
- * @copyright  2014 Petr Skoda
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-namespace tool_capability\event;
-
-/**
- * The tool_capability report viewed event class.
- *
- * @package    tool_capability
- * @since      Moodle 2.7
- * @copyright  2014 Petr Skoda
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class report_viewed extends \core\event\base {
-
-    /**
-     * Init method.
-     *
-     * @return void
-     */
-    protected function init() {
-        $this->data['crud'] = 'r';
-        $this->data['edulevel'] = self::LEVEL_OTHER;
-        $this->context = \context_system::instance();
-    }
-
-    /**
-     * Return localised event name.
-     *
-     * @return string
-     */
-    public static function get_name() {
-        return get_string('eventreportviewed', 'tool_capability');
-    }
-
-    /**
-     * Returns description of what happened.
-     *
-     * @return string
-     */
-    public function get_description() {
-        return "The user with id '$this->userid' viewed the capability overview report.";
-    }
-
-    /**
-     * Return the legacy event log data.
-     *
-     * @return array
-     */
-    protected function get_legacy_logdata() {
-        return array(SITEID, 'admin', 'tool capability', 'tool/capability/index.php');
-    }
-
-    /**
-     * Returns relevant URL.
-     *
-     * @return \moodle_url
-     */
-    public function get_url() {
-        return new \moodle_url('/admin/tool/capability/index.php');
-    }
-}
-

admin/tool/capability/index.php

@@ -92,7 +92,7 @@ if ($data = $form->get_data()) {
     }
 }
 
-\tool_capability\event\report_viewed::create()->trigger();
+add_to_log(SITEID, "admin", "tool capability", "tool/capability/index.php", count($capabilities));
 
 $renderer = $PAGE->get_renderer('tool_capability');
 

admin/tool/capability/lang/en/tool_capability.php

@@ -24,7 +24,6 @@
 
 $string['capabilitylabel'] = 'Capability:';
 $string['capabilityreport'] = 'Capability overview';
-$string['eventreportviewed'] = 'Report viewed';
 $string['forroles'] = 'For roles {$a}';
 $string['getreport'] = 'Get the overview';
 $string['changeoverrides'] = 'Change overrides in this context';

admin/tool/capability/tests/events_test.php

@@ -1,65 +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 capability overview events.
- *
- * @package    tool_capability
- * @copyright  2014 Petr Skoda
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later.
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * Class for capability overview events.
- *
- * @package    tool_capability
- * @copyright  2014 Petr Skoda
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later.
- */
-class tool_capability_events_testcase extends advanced_testcase {
-
-    /**
-     * Setup testcase.
-     */
-    public function setUp() {
-        $this->setAdminUser();
-        $this->resetAfterTest();
-    }
-
-    /**
-     * Test the report viewed event.
-     */
-    public function test_report_viewed() {
-        $event = \tool_capability\event\report_viewed::create();
-
-        // Trigger and capture the event.
-        $sink = $this->redirectEvents();
-        $event->trigger();
-        $events = $sink->get_events();
-        $event = reset($events);
-
-        $this->assertInstanceOf('\tool_capability\event\report_viewed', $event);
-        $this->assertEquals(context_system::instance(), $event->get_context());
-        $expected = array(SITEID, "admin", "tool capability", "tool/capability/index.php");
-        $this->assertEventLegacyLogData($expected, $event);
-        $this->assertEventContextNotUsed($event);
-        $url = new moodle_url('/admin/tool/capability/index.php');
-        $this->assertEquals($url, $event->get_url());
-        $event->get_name();
-    }
-}

admin/tool/capability/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2015051100; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2015050500; // Requires this Moodle version.
+$plugin->version   = 2013110500; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2013110500; // 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

@@ -9,10 +9,10 @@ YUI.add('moodle-tool_capability-search', function (Y, NAME) {
 /**
  * Constructs a new capability search manager.
  *
- * @namespace M.tool_capability
+ * @namespace M.tool_capability.search
  * @class Search
  * @constructor
- * @extends Base
+ * @extends Y.Base
  */
 var SEARCH = function() {
     SEARCH.superclass.constructor.apply(this, arguments);
@@ -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);
@@ -143,12 +144,17 @@ Y.extend(SEARCH, Y.Base, SEARCH.prototype, {
     }
 });
 
+/**
+ * Core namespace.
+ * @static
+ * @class tool_capability
+ */
 M.tool_capability = M.tool_capability || {};
 
 /**
  * Initialises capability search functionality.
  * @static
- * @method M.tool_capability.init_capability_search
+ * @method init_capability_search
  * @param {Object} options
  */
 M.tool_capability.init_capability_search = function(options) {

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

@@ -9,10 +9,10 @@ YUI.add('moodle-tool_capability-search', function (Y, NAME) {
 /**
  * Constructs a new capability search manager.
  *
- * @namespace M.tool_capability
+ * @namespace M.tool_capability.search
  * @class Search
  * @constructor
- * @extends Base
+ * @extends Y.Base
  */
 var SEARCH = function() {
     SEARCH.superclass.constructor.apply(this, arguments);
@@ -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);
@@ -143,12 +144,17 @@ Y.extend(SEARCH, Y.Base, SEARCH.prototype, {
     }
 });
 
+/**
+ * Core namespace.
+ * @static
+ * @class tool_capability
+ */
 M.tool_capability = M.tool_capability || {};
 
 /**
  * Initialises capability search functionality.
  * @static
- * @method M.tool_capability.init_capability_search
+ * @method init_capability_search
  * @param {Object} options
  */
 M.tool_capability.init_capability_search = function(options) {

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

@@ -7,10 +7,10 @@
 /**
  * Constructs a new capability search manager.
  *
- * @namespace M.tool_capability
+ * @namespace M.tool_capability.search
  * @class Search
  * @constructor
- * @extends Base
+ * @extends Y.Base
  */
 var SEARCH = function() {
     SEARCH.superclass.constructor.apply(this, arguments);
@@ -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);
@@ -141,12 +142,17 @@ Y.extend(SEARCH, Y.Base, SEARCH.prototype, {
     }
 });
 
+/**
+ * Core namespace.
+ * @static
+ * @class tool_capability
+ */
 M.tool_capability = M.tool_capability || {};
 
 /**
  * Initialises capability search functionality.
  * @static
- * @method M.tool_capability.init_capability_search
+ * @method init_capability_search
  * @param {Object} options
  */
 M.tool_capability.init_capability_search = function(options) {

admin/tool/customlang/db/upgrade.php

@@ -45,14 +45,5 @@ function xmldb_tool_customlang_upgrade($oldversion) {
     // Moodle v2.6.0 release upgrade line.
     // Put any upgrade step following this.
 
-    // 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.
-
-    // Moodle v2.9.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/index.php

@@ -55,7 +55,7 @@ if ($action === 'checkout') {
     $progressbar->create();         // prints the HTML code of the progress bar
 
     // we may need a bit of extra execution time and memory here
-    core_php_time_limit::raise(HOURSECS);
+    @set_time_limit(HOURSECS);
     raise_memory_limit(MEMORY_EXTRA);
     tool_customlang_utils::checkout($lng, $progressbar);
 

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