Moodle release 3.2.1

The PARAM_TEXT has been misused in certain cases here. The 'action'
parameter seems to always be alphabetic, with values like
savesubmission, editsubmission and others as handled in assign::view().

Fixing the action handling fixes the reported XSS issue. While working
on it, I spotted two more places where PARAM_TEXT does not seem
appropriate. I include changes for them too, even if they are no
strictly related to the reported bug and there are no known ways to
abuse it.

* The 'plugin' looks like PARAM_PLUGIN and is even declared as such in
  some other parts of the assignment code (such as feedback forms).

* The 'workflowstate' is one of the ASSIGN_MARKING_WORKFLOW_STATE
  constants and is supposed to be alpha in external function input
  parameters handling, too.

.eslintignore

@@ -9,7 +9,6 @@ auth/cas/CAS/
 auth/fc/fcFPP.php
 enrol/lti/ims-blti/
 filter/algebra/AlgParser.pm
-filter/mathjaxloader/contrib/a11y/
 filter/tex/mimetex.*
 lib/editor/atto/yui/src/rangy/js/*.*
 lib/editor/tinymce/plugins/pdw/tinymce/
@@ -57,10 +56,7 @@ lib/amd/src/chartjs-lazy.js
 lib/maxmind/GeoIp2/
 lib/maxmind/MaxMind/
 lib/ltiprovider/
-lib/amd/src/truncate.js
-lib/fonts/
-media/player/videojs/amd/src/video-lazy.js
-media/player/videojs/amd/src/Youtube-lazy.js
+media/player/videojs/amd/src/
 media/player/videojs/videojs/
 mod/assign/feedback/editpdf/fpdi/
 repository/s3/S3.php
@@ -77,8 +73,6 @@ theme/boost/amd/src/tab.js
 theme/boost/amd/src/tooltip.js
 theme/boost/amd/src/util.js
 theme/boost/amd/src/tether.js
-theme/boost/scss/fontawesome/
 theme/bootstrapbase/less/bootstrap/
 theme/bootstrapbase/javascript/html5shiv.js
-theme/bootstrapbase/amd/src/bootstrap.js
-theme/bootstrapbase/less/fontawesome/
+theme/bootstrapbase/amd/src/bootstrap.js

.gherkin-lintrc

@@ -1,20 +0,0 @@
-{
-  "indentation": ["on",{
-    "Feature": 0,
-    "Background": 2,
-    "Scenario": 2,
-    "Step": 4,
-    "given": 4,
-    "and": 4
-  }],
-  "no-dupe-feature-names": "on",
-  "no-dupe-scenario-names": "off",
-  "no-empty-file": "on",
-  "no-files-without-scenarios": "on",
-  "no-multiple-empty-lines": "on",
-  "no-partially-commented-tag-lines": "on",
-  "no-trailing-spaces": "on",
-  "no-unamed-features": "on",
-  "no-unamed-scenarios": "on",
-  "no-scenario-outlines-without-examples": "on"
-}

.stylelintignore

@@ -10,7 +10,6 @@ auth/cas/CAS/
 auth/fc/fcFPP.php
 enrol/lti/ims-blti/
 filter/algebra/AlgParser.pm
-filter/mathjaxloader/contrib/a11y/
 filter/tex/mimetex.*
 lib/editor/atto/yui/src/rangy/js/*.*
 lib/editor/tinymce/plugins/pdw/tinymce/
@@ -58,10 +57,7 @@ lib/amd/src/chartjs-lazy.js
 lib/maxmind/GeoIp2/
 lib/maxmind/MaxMind/
 lib/ltiprovider/
-lib/amd/src/truncate.js
-lib/fonts/
-media/player/videojs/amd/src/video-lazy.js
-media/player/videojs/amd/src/Youtube-lazy.js
+media/player/videojs/amd/src/
 media/player/videojs/videojs/
 mod/assign/feedback/editpdf/fpdi/
 repository/s3/S3.php
@@ -78,8 +74,6 @@ theme/boost/amd/src/tab.js
 theme/boost/amd/src/tooltip.js
 theme/boost/amd/src/util.js
 theme/boost/amd/src/tether.js
-theme/boost/scss/fontawesome/
 theme/bootstrapbase/less/bootstrap/
 theme/bootstrapbase/javascript/html5shiv.js
-theme/bootstrapbase/amd/src/bootstrap.js
-theme/bootstrapbase/less/fontawesome/
+theme/bootstrapbase/amd/src/bootstrap.js

.travis.yml

@@ -16,9 +16,6 @@ php:
     - 7.1
     - 5.6
 
-addons:
-  postgresql: "9.3"
-
 services:
     - redis-server
 
@@ -117,7 +114,7 @@ before_script:
 
         # The wwwroot and dataroot.
         sed -i \
-          -e "s%http://example.com/moodle%https://localhost%" \
+          -e "s%http://example.com/moodle%http://localhost%" \
           -e "s%/home/example/moodledata%/home/travis/roots/base%" \
           config.php ;
 
@@ -137,13 +134,11 @@ before_script:
           sed -i \
             -e "s%= 'pgsql'%= 'mysqli'%" \
             -e "s%= 'username'%= 'travis'%" \
-            -e "s%=> 'utf8mb4_unicode_ci'%=> 'utf8mb4_bin'%" \
             config.php;
 
           mysql -u root -e 'SET GLOBAL innodb_file_format=barracuda;' ;
           mysql -u root -e 'SET GLOBAL innodb_file_per_table=ON;' ;
-          mysql -u root -e 'SET GLOBAL innodb_large_prefix=ON;' ;
-          mysql -e 'CREATE DATABASE travis_ci_test DEFAULT CHARACTER SET utf8mb4 DEFAULT COLLATE utf8mb4_bin;' ;
+          mysql -e 'CREATE DATABASE travis_ci_test DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_bin;' ;
         fi
       fi
 
@@ -187,7 +182,7 @@ before_script:
         # We need the official upstream for comparison
         git remote add upstream https://github.com/moodle/moodle.git;
 
-        git fetch upstream master;
+        git fetch upstream MOODLE_32_STABLE;
         export GIT_PREVIOUS_COMMIT="`git merge-base FETCH_HEAD $TRAVIS_COMMIT`";
         export GIT_COMMIT="$TRAVIS_COMMIT";
         export UPSTREAM_FETCH_HEAD=`git rev-parse FETCH_HEAD`

Gruntfile.js

@@ -106,6 +106,7 @@ module.exports = function(grunt) {
         return libs;
     };
 
+
     // Project configuration.
     grunt.initConfig({
         eslint: {
@@ -170,10 +171,6 @@ module.exports = function(grunt) {
                 files: ['**/yui/src/**/*.js'],
                 tasks: ['yui']
             },
-            gherkinlint: {
-                files: ['**/tests/behat/*.feature'],
-                tasks: ['gherkinlint']
-            }
         },
         shifter: {
             options: {
@@ -181,11 +178,6 @@ module.exports = function(grunt) {
                 paths: [cwd]
             }
         },
-        gherkinlint: {
-            options: {
-                files: ['**/tests/behat/*.feature'],
-            }
-        },
         stylelint: {
             less: {
                 options: {
@@ -326,22 +318,6 @@ module.exports = function(grunt) {
         }, done);
     };
 
-    tasks.gherkinlint = function() {
-        var done = this.async(),
-            options = grunt.config('gherkinlint.options');
-
-        var args = grunt.file.expand(options.files);
-        args.unshift(path.normalize(__dirname + '/node_modules/.bin/gherkin-lint'));
-        grunt.util.spawn({
-            cmd: 'node',
-            args: args,
-            opts: {stdio: 'inherit', env: process.env}
-        }, function(error, result, code) {
-            // Propagate the exit code.
-            done(code);
-        });
-    };
-
     tasks.startup = function() {
         // Are we in a YUI directory?
         if (path.basename(path.resolve(cwd, '../../')) == 'yui') {
@@ -353,7 +329,6 @@ module.exports = function(grunt) {
             // Run them all!.
             grunt.task.run('css');
             grunt.task.run('js');
-            grunt.task.run('gherkinlint');
         }
     };
 
@@ -368,7 +343,6 @@ module.exports = function(grunt) {
           grunt.config('uglify.amd.files', [{expand: true, src: files, rename: uglifyRename}]);
           grunt.config('shifter.options.paths', files);
           grunt.config('stylelint.less.src', files);
-          grunt.config('gherkinlint.options.files', files);
           changedFiles = Object.create(null);
     }, 200);
 
@@ -386,7 +360,6 @@ module.exports = function(grunt) {
 
     // Register JS tasks.
     grunt.registerTask('shifter', 'Run Shifter against the current directory', tasks.shifter);
-    grunt.registerTask('gherkinlint', 'Run gherkinlint against the current directory', tasks.gherkinlint);
     grunt.registerTask('ignorefiles', 'Generate ignore files for linters', tasks.ignorefiles);
     grunt.registerTask('yui', ['eslint:yui', 'shifter']);
     grunt.registerTask('amd', ['eslint:amd', 'uglify']);

admin/auth_config.php

@@ -16,9 +16,6 @@ $err = array();
 
 $returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=manageauths";
 
-debugging("Use of config.html files in authentication plugins have been deprecated. " .
-          " Please migrate your plugin to use the admin settings API", DEBUG_DEVELOPER);
-
 // save configuration changes
 if ($frm = data_submitted() and confirm_sesskey()) {
 
@@ -89,28 +86,12 @@ exit;
 
 /// Functions /////////////////////////////////////////////////////////////////
 
-
-/**
- * auth field locking
- * Good enough for most auth plugins
- * but some may want a custom one if they are offering
- * other options
- * Note: lockconfig_ fields have special handling.
- *
- * @param string $auth authentication plugin shortname
- * @param array $user_fields user profile fields
- * @param string $helptext help text to be displayed at top of form
- * @param boolean $retrieveopts Map fields or lock only.
- * @param boolean $updateopts Allow remote updates
- * @param array $customfields list of custom profile fields
- * @deprecated since Moodle 3.3
- */
+// Good enough for most auth plugins
+// but some may want a custom one if they are offering
+// other options
+// Note: lockconfig_ fields have special handling.
 function print_auth_lock_options($auth, $user_fields, $helptext, $retrieveopts, $updateopts, $customfields = array()) {
     global $DB, $OUTPUT;
-    debugging("The function 'print_auth_lock_options' has been deprecated, " .
-              "Please migrate your code to use the admin settings API and use the function 'display_auth_lock_options' instead. ",
-              DEBUG_DEVELOPER);
-
     echo '<tr><td colspan="3">';
     if ($retrieveopts) {
         echo $OUTPUT->heading(get_string('auth_data_mapping', 'auth'));

admin/blocks.php

@@ -168,10 +168,10 @@
             $visible = '';
         } else if ($blocks[$blockid]->visible) {
             $visible = '<a href="blocks.php?hide='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strhide.'">'.
-                       $OUTPUT->pix_icon('t/hide', $strhide) . '</a>';
+                       '<img src="'.$OUTPUT->pix_url('t/hide') . '" class="iconsmall" alt="'.$strhide.'" /></a>';
         } else {
             $visible = '<a href="blocks.php?show='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strshow.'">'.
-                       $OUTPUT->pix_icon('t/show', $strshow) . '</a>';
+                       '<img src="'.$OUTPUT->pix_url('t/show') . '" class="iconsmall" alt="'.$strshow.'" /></a>';
             $class = 'dimmed_text';
         }
 
@@ -186,10 +186,10 @@
             $undeletable = '';
         } else if (in_array($blockname, $undeletableblocktypes)) {
             $undeletable = '<a href="blocks.php?unprotect='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strunprotect.'">'.
-                       $OUTPUT->pix_icon('t/unlock', $strunprotect) . '</a>';
+                       '<img src="'.$OUTPUT->pix_url('t/unlock') . '" class="iconsmall" alt="'.$strunprotect.'" /></a>';
         } else {
             $undeletable = '<a href="blocks.php?protect='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strprotect.'">'.
-                       $OUTPUT->pix_icon('t/lock', $strprotect) . '</a>';
+                       '<img src="'.$OUTPUT->pix_url('t/lock') . '" class="iconsmall" alt="'.$strprotect.'" /></a>';
         }
 
         $row = array(

admin/cli/cfg.php

@@ -1,173 +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 script allowing to get and set config values.
- *
- * This is technically just a thin wrapper for {@link get_config()} and
- * {@link set_config()} functions.
- *
- * @package     core
- * @subpackage  cli
- * @copyright   2017 David Mudrák <david@moodle.com>
- * @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');
-
-$usage = "Displays the current value of the given site setting. Allows to set it to the given value, too.
-
-Usage:
-    # php cfg.php [--component=<componentname>] [--json] [--shell-arg]
-    # php cfg.php --name=<configname> [--component=<componentname>] [--shell-arg] [--no-eol]
-    # php cfg.php --name=<configname> [--component=<componentname>] --set=<value>
-    # php cfg.php --name=<configname> [--component=<componentname>] --unset
-    # php cfg.php [--help|-h]
-
-Options:
-    -h --help                   Print this help.
-    --component=<frankenstyle>  Name of the component the variable is part of. Defaults to core.
-    --name=<configname>         Name of the configuration variable to get/set. If missing, print all
-                                configuration variables of the given component.
-    --set=<value>               Set the given variable to this value.
-    --unset                     Unset the given variable.
-    --shell-arg                 Escape output values so that they can be directly used as shell script arguments.
-    --json                      Encode output list of values using JSON notation.
-    --no-eol                    Do not include the trailing new line character when printing the value.
-
-The list of all variables of the given component can be printed as
-tab-separated list (default) or JSON object (--json). Particular values are
-printed as raw text values, optionally escaped so that they can be directly
-used as shell script arguments (--shell-arg). Single values are displayed with
-trailing new line by default, unless explicitly disabled (--no-eol).
-
-In the read mode, the script exits with success status 0 if the requested value
-is found. If the requested variable is not set, the script exits with status 3.
-When listing all variables of the component, the exit status is always 0 even
-if no variables for the given component are found. When setting/unsetting a
-value, the exit status is 0. When attempting to set/unset a value that has
-already been hard-set in config.php, the script exits with error status 4. In
-case of unexpected error, the script exits with error status 1.
-
-Examples:
-
-    # php cfg.php
-        Prints tab-separated list of all core configuration variables and their values.
-
-    # php cfg.php --json
-        Prints list of all core configuration variables and their values as a JSON object.
-
-    # php cfg.php --name=release
-        Prints the given configuration variable - e.g. \$CFG->release in this case.
-
-    # php cfg.php --component=tool_recyclebin
-    #   Prints tab-separated list of the plugin's configuration variables.
-
-    # export DATAROOT=\$(php cfg.php --name=dataroot --shell-arg --no-eol)
-        Stores the given configuration variable in the shell variable, escaped
-        so that it can be safely used as a shell argument.
-
-    # php cfg.php --name=theme --set=clean
-        Sets the given configuration variable to the given value.
-
-    # php cfg.php --name=noemailever --unset
-        Unsets the previously configured variable.
-";
-
-list($options, $unrecognised) = cli_get_params([
-    'help' => false,
-    'component' => null,
-    'name' => null,
-    'set' => null,
-    'unset' => false,
-    'shell-arg' => false,
-    'json' => false,
-    'no-eol' => false,
-], [
-    'h' => 'help'
-]);
-
-if ($unrecognised) {
-    $unrecognised = implode(PHP_EOL.'  ', $unrecognised);
-    cli_error(get_string('cliunknowoption', 'core_admin', $unrecognised));
-}
-
-if ($options['help']) {
-    cli_writeln($usage);
-    exit(2);
-}
-
-if ($options['unset'] || $options['set'] !== null) {
-    // Unset the variable or set it to the given value.
-    if (empty($options['name'])) {
-        cli_error('Missing configuration variable name', 2);
-    }
-
-    // Check that the variable is not hard-set in the main config.php already.
-    if (array_key_exists($options['name'], $CFG->config_php_settings)) {
-        cli_error('The configuration variable is hard-set in the config.php, unable to change.', 4);
-    }
-
-    set_config($options['name'], $options['set'], $options['component']);
-    exit(0);
-}
-
-if ($options['name'] === null) {
-    // List all variables provided by the component (defaults to core).
-    $got = get_config($options['component']);
-
-    if ($options['json']) {
-        cli_writeln(json_encode($got));
-
-    } else {
-        foreach ($got as $name => $value) {
-            if ($options['shell-arg']) {
-                $value = escapeshellarg($value);
-            }
-            cli_writeln($name."\t".$value);
-        }
-    }
-
-    exit(0);
-
-} else {
-    // Display the value of a single variable.
-
-    $got = get_config($options['component'], $options['name']);
-
-    if ($got === false) {
-        cli_error('No such configuration variable found.', 3);
-    }
-
-    if ($options['shell-arg']) {
-        $got = escapeshellarg($got);
-    }
-
-    if ($options['json']) {
-        $got = json_encode($got);
-    }
-
-    if ($options['no-eol']) {
-        cli_write($got);
-    } else {
-        cli_writeln($got);
-    }
-
-    exit(0);
-}

admin/cli/mysql_collation.php

@@ -64,71 +64,6 @@ if (!empty($options['collation'])) {
         cli_error("Error: collation '$collation' is not available on this server!");
     }
 
-    $collationinfo = explode('_', $collation);
-    $charset = reset($collationinfo);
-
-    $engine = strtolower($DB->get_dbengine());
-
-    // Do checks for utf8mb4.
-    if (strpos($collation, 'utf8mb4') === 0) {
-        // Do we have the right engine?
-        if ($engine !== 'innodb' && $engine !== 'xtradb') {
-            cli_error("Error: '$collation' requires InnoDB or XtraDB set as the engine.");
-        }
-        // Are we using Barracuda?
-        if ($DB->get_row_format() != 'Barracuda') {
-            // Try setting it here.
-            try {
-                $DB->execute("SET GLOBAL innodb_file_format=Barracuda");
-            } catch (dml_exception $e) {
-                cli_error("Error: '$collation' requires the file format to be set to Barracuda.
-                        An attempt was made to change the format, but it failed. Please try doing this manually.");
-            }
-            echo "GLOBAL SETTING: innodb_file_format changed to Barracuda\n";
-        }
-        // Is one file per table being used?
-        if (!$DB->is_file_per_table_enabled()) {
-            try {
-                $DB->execute("SET GLOBAL innodb_file_per_table=1");
-            } catch (dml_exception $e) {
-                cli_error("Error: '$collation' requires the setting 'innodb_file_per_table' be set to 'ON'.
-                        An attempt was made to change the format, but it failed. Please try doing this manually.");
-            }
-            echo "GLOBAL SETTING: innodb_file_per_table changed to 1\n";
-        }
-        // Is large prefix set?
-        if (!$DB->is_large_prefix_enabled()) {
-            try {
-                $DB->execute("SET GLOBAL innodb_large_prefix=1");
-            } catch (dml_exception $e) {
-                cli_error("Error: '$collation' requires the setting 'innodb_large_prefix' be set to 'ON'.
-                        An attempt was made to change the format, but it failed. Please try doing this manually.");
-            }
-            echo "GLOBAL SETTING: innodb_large_prefix changed to 1\n";
-        }
-    }
-
-    $sql = "SHOW VARIABLES LIKE 'collation_database'";
-    if (!$dbcollation = $DB->get_record_sql($sql)) {
-        cli_error("Error: Could not access collation information on the database.");
-    }
-    $sql = "SHOW VARIABLES LIKE 'character_set_database'";
-    if (!$dbcharset = $DB->get_record_sql($sql)) {
-        cli_error("Error: Could not access character set information on the database.");
-    }
-    if ($dbcollation->value !== $collation || $dbcharset->value !== $charset) {
-        // Try to convert the DB.
-        echo "Converting database to '$collation' for $CFG->wwwroot:\n";
-        $sql = "ALTER DATABASE $CFG->dbname DEFAULT CHARACTER SET $charset DEFAULT COLLATE = $collation";
-        try {
-            $DB->change_database_structure($sql);
-        } catch (exception $e) {
-            cli_error("Error: Tried to alter the database with no success. Please try manually changing the database
-                    to the new collation and character set and then run this script again.");
-        }
-        echo "DATABASE CONVERTED\n";
-    }
-
     echo "Converting tables and columns to '$collation' for $CFG->wwwroot:\n";
     $prefix = $DB->get_prefix();
     $prefix = str_replace('_', '\\_', $prefix);
@@ -145,7 +80,7 @@ if (!empty($options['collation'])) {
             $skipped++;
 
         } else {
-            $DB->change_database_structure("ALTER TABLE $table->name DEFAULT CHARACTER SET $charset DEFAULT COLLATE = $collation");
+            $DB->change_database_structure("ALTER TABLE $table->name DEFAULT COLLATE = $collation");
             echo "CONVERTED\n";
             $converted++;
         }
@@ -161,32 +96,18 @@ if (!empty($options['collation'])) {
                 continue;
             }
 
-            // Check for utf8mb4 collation.
-            $rowformat = $DB->get_row_format_sql($engine, $collation);
-
             if ($column->type === 'tinytext' or $column->type === 'mediumtext' or $column->type === 'text' or $column->type === 'longtext') {
                 $notnull = ($column->null === 'NO') ? 'NOT NULL' : 'NULL';
                 $default = (!is_null($column->default) and $column->default !== '') ? "DEFAULT '$column->default'" : '';
                 // primary, unique and inc are not supported for texts
-                $sql = "ALTER TABLE $table->name
-                        MODIFY COLUMN $column->field $column->type
-                        CHARACTER SET $charset
-                        COLLATE $collation $notnull $default";
+                $sql = "ALTER TABLE $table->name MODIFY COLUMN $column->field $column->type COLLATE $collation $notnull $default";
                 $DB->change_database_structure($sql);
 
             } else if (strpos($column->type, 'varchar') === 0) {
                 $notnull = ($column->null === 'NO') ? 'NOT NULL' : 'NULL';
                 $default = !is_null($column->default) ? "DEFAULT '$column->default'" : '';
-
-                if ($rowformat != '') {
-                    $sql = "ALTER TABLE $table->name $rowformat";
-                    $DB->change_database_structure($sql);
-                }
-
-                $sql = "ALTER TABLE $table->name
-                        MODIFY COLUMN $column->field $column->type
-                        CHARACTER SET $charset
-                        COLLATE $collation $notnull $default";
+                // primary, unique and inc are not supported for texts
+                $sql = "ALTER TABLE $table->name MODIFY COLUMN $column->field $column->type COLLATE $collation $notnull $default";
                 $DB->change_database_structure($sql);
             } else {
                 echo "ERROR (unknown column type: $column->type)\n";
@@ -259,9 +180,7 @@ function mysql_get_collations() {
     global $DB;
 
     $collations = array();
-    $sql = "SHOW COLLATION
-            WHERE Collation LIKE 'utf8\_%' AND Charset = 'utf8'
-               OR Collation LIKE 'utf8mb4\_%' AND Charset = 'utf8mb4'";
+    $sql = "SHOW COLLATION WHERE Collation LIKE 'utf8\_%' AND Charset = 'utf8'";
     $rs = $DB->get_recordset_sql($sql);
     foreach ($rs as $collation) {
         $collations[$collation->collation] = $collation->collation;

admin/editors.php

@@ -47,7 +47,6 @@ switch ($action) {
         // remove from enabled list
         $key = array_search($editor, $active_editors);
         unset($active_editors[$key]);
-        add_to_config_log('editor_visibility', '1', '0', $editor);
         break;
 
     case 'enable':
@@ -55,7 +54,6 @@ switch ($action) {
         if (!in_array($editor, $active_editors)) {
             $active_editors[] = $editor;
             $active_editors = array_unique($active_editors);
-            add_to_config_log('editor_visibility', '0', '1', $editor);
         }
         break;
 
@@ -68,7 +66,6 @@ switch ($action) {
                 $fsave = $active_editors[$key];
                 $active_editors[$key] = $active_editors[$key + 1];
                 $active_editors[$key + 1] = $fsave;
-                add_to_config_log('editor_position', $key, $key + 1, $editor);
             }
         }
         break;
@@ -82,7 +79,6 @@ switch ($action) {
                 $fsave = $active_editors[$key];
                 $active_editors[$key] = $active_editors[$key - 1];
                 $active_editors[$key - 1] = $fsave;
-                add_to_config_log('editor_position', $key, $key - 1, $editor);
             }
         }
         break;

admin/environment.xml

@@ -1723,21 +1723,6 @@
           <ON_CHECK message="libcurlwarning" />
         </FEEDBACK>
       </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbfileformat" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbfilepertable" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddblargeprefix" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
     </CUSTOM_CHECKS>
   </MOODLE>
   <MOODLE version="3.2" requires="2.7">
@@ -1888,196 +1873,6 @@
           <ON_CHECK message="libcurlwarning" />
         </FEEDBACK>
       </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbfileformat" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbfilepertable" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddblargeprefix" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-    </CUSTOM_CHECKS>
-  </MOODLE>
-  <MOODLE version="3.3" requires="2.7">
-    <UNICODE level="required">
-      <FEEDBACK>
-        <ON_ERROR message="unicoderequired" />
-      </FEEDBACK>
-    </UNICODE>
-    <DATABASE level="required">
-      <VENDOR name="mariadb" version="5.5.31" />
-      <VENDOR name="mysql" version="5.5.31" />
-      <VENDOR name="postgres" version="9.3" />
-      <VENDOR name="mssql" version="10.0" />
-      <VENDOR name="oracle" version="10.2" />
-    </DATABASE>
-    <PHP version="5.6.5" level="required">
-    </PHP>
-    <PCREUNICODE level="optional">
-      <FEEDBACK>
-        <ON_CHECK message="pcreunicodewarning" />
-      </FEEDBACK>
-    </PCREUNICODE>
-    <PHP_EXTENSIONS>
-      <PHP_EXTENSION name="iconv" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="iconvrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="mbstring" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="mbstringrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="curl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="curlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="openssl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="opensslrequired" />
-        </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="xmlreader" 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_CHECK file="lib/upgradelib.php" function="check_unoconv_version" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="unoconvwarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="libcurlwarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbfileformat" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbfilepertable" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddblargeprefix" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_is_https" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="ishttpswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_incomplete_unicode_support" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="incompleteunicodesupport" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
     </CUSTOM_CHECKS>
   </MOODLE>
 </COMPATIBILITY_MATRIX>

admin/filters.php

@@ -218,7 +218,7 @@ function get_table_row(\core\plugininfo\filter $plugininfo, $state, $isfirstrow,
 
     // Re-order.
     $updown = '';
-    $spacer = $OUTPUT->spacer();
+    $spacer = '<img src="' . $OUTPUT->pix_url('spacer') . '" class="iconsmall" alt="" />';
     if ($state->active != TEXTFILTER_DISABLED) {
         if (!$isfirstrow) {
             $updown .= $OUTPUT->action_icon(filters_action_url($filter, 'up'), new pix_icon('t/up', get_string('up'), '', array('class' => 'iconsmall')));

admin/mnet/access_control.php

@@ -150,7 +150,7 @@ foreach ($columns as $column) {
     } else {
         $columndir = $dir == "ASC" ? "DESC" : "ASC";
         $columnicon = $dir == "ASC" ? "down" : "up";
-        $columnicon = " " . $OUTPUT->pix_icon('t/' . $columnicon, get_string('sort'));
+        $columnicon = " <img src=\"" . $OUTPUT->pix_url('t/' . $columnicon) . "\" alt=\"\" />";
     }
     $headings[$column] = "<a href=\"?sort=$column&amp;dir=$columndir&amp;\">".$string[$column]."</a>$columnicon";
 }

admin/modules.php

@@ -94,7 +94,7 @@
             $missing = true;
         } else {
             // took out hspace="\10\", because it does not validate. don't know what to replace with.
-            $icon = "<img src=\"" . $OUTPUT->image_url('icon', $module->name) . "\" class=\"icon\" alt=\"\" />";
+            $icon = "<img src=\"" . $OUTPUT->pix_url('icon', $module->name) . "\" class=\"icon\" alt=\"\" />";
             $strmodulename = $icon.' '.get_string('modulename', $module->name);
             $missing = false;
         }
@@ -130,11 +130,11 @@
             $class   = '';
         } else if ($module->visible) {
             $visible = "<a href=\"modules.php?hide=$module->name&amp;sesskey=".sesskey()."\" title=\"$strhide\">".
-                       $OUTPUT->pix_icon('t/hide', $strhide) . '</a>';
+                       "<img src=\"" . $OUTPUT->pix_url('t/hide') . "\" class=\"iconsmall\" alt=\"$strhide\" /></a>";
             $class   = '';
         } else {
             $visible = "<a href=\"modules.php?show=$module->name&amp;sesskey=".sesskey()."\" title=\"$strshow\">".
-                       $OUTPUT->pix_icon('t/show', $strshow) . '</a>';
+                       "<img src=\"" . $OUTPUT->pix_url('t/show') . "\" class=\"iconsmall\" alt=\"$strshow\" /></a>";
             $class =   'dimmed_text';
         }
         if ($module->name == "forum") {

admin/oauth2callback.php

@@ -30,17 +30,6 @@
 
 require_once(__DIR__ . '/../config.php');
 
-$error = optional_param('error', '', PARAM_RAW);
-if ($error) {
-    $message = optional_param('error_description', '', PARAM_RAW);
-    if ($message) {
-        print_error($message);
-    } else {
-        print_error($error);
-    }
-    die();
-}
-
 // The authorization code generated by the authorization server.
 $code = required_param('code', PARAM_RAW);
 // The state parameter we've given (used in moodle as a redirect url).

admin/renderer.php

@@ -1612,10 +1612,10 @@ class core_admin_renderer extends plugin_renderer_base {
                 $row = new html_table_row();
                 $row->attributes['class'] = 'type-' . $plugin->type . ' name-' . $plugin->type . '_' . $plugin->name;
 
-                if ($this->page->theme->resolve_image_location('icon', $plugin->type . '_' . $plugin->name, null)) {
+                if ($this->page->theme->resolve_image_location('icon', $plugin->type . '_' . $plugin->name)) {
                     $icon = $this->output->pix_icon('icon', '', $plugin->type . '_' . $plugin->name, array('class' => 'icon pluginicon'));
                 } else {
-                    $icon = $this->output->spacer();
+                    $icon = $this->output->pix_icon('spacer', '', 'moodle', array('class' => 'icon pluginicon noicon'));
                 }
                 $status = $plugin->get_status();
                 $row->attributes['class'] .= ' status-'.$status;

admin/repository.php

@@ -370,14 +370,14 @@ if (($action == 'edit') || ($action == 'new')) {
 
             if ($updowncount > 1) {
                 $updown .= "<a href=\"$sesskeyurl&amp;action=moveup&amp;repos=".$typename."\">";
-                $updown .= $OUTPUT->pix_icon('t/up', get_string('moveup')) . "</a>&nbsp;";
+                $updown .= "<img src=\"" . $OUTPUT->pix_url('t/up') . "\" alt=\"up\" /></a>&nbsp;";
             }
             else {
                 $updown .= $spacer;
             }
             if ($updowncount < $totalrepositorytypes) {
                 $updown .= "<a href=\"$sesskeyurl&amp;action=movedown&amp;repos=".$typename."\">";
-                $updown .= $OUTPUT->pix_icon('t/down', get_string('movedown')) . "</a>&nbsp;";
+                $updown .= "<img src=\"" . $OUTPUT->pix_url('t/down') . "\" alt=\"down\" /></a>";
             }
             else {
                 $updown .= $spacer;

admin/roles/classes/capability_table_with_risks.php

@@ -183,7 +183,8 @@ abstract class core_role_capability_table_with_risks extends core_role_capabilit
     public function get_risk_icon($type) {
         global $OUTPUT;
 
-        $text = $OUTPUT->pix_icon('i/' . str_replace('risk', 'risk_', $type), get_string($type . 'short', 'admin'));
+        $iconurl = $OUTPUT->pix_url('i/' . str_replace('risk', 'risk_', $type));
+        $text = '<img src="' . $iconurl . '" alt="' . get_string($type . 'short', 'admin') . '" />';
         $action = new popup_action('click', $this->risksurl, 'docspopup');
         $riskicon = $OUTPUT->action_link($this->risksurl, $text, $action, array('title'=>get_string($type, 'admin')));
 

admin/roles/classes/override_permissions_table_advanced.php

@@ -56,24 +56,6 @@ class core_role_override_permissions_table_advanced extends core_role_capability
         }
     }
 
-    /**
-     * This method adds an additional class to a row if capability is other than inherited.
-     *
-     * @param stdClass $capability
-     * @return array
-     */
-    protected function get_row_attributes($capability) {
-        $rowattributes = parent::get_row_attributes($capability);
-        if ($this->permissions[$capability->name] !== 0) {
-            if (empty($rowattributes['class'])) {
-                $rowattributes['class'] = "overriddenpermission";
-            } else {
-                $rowattributes['class'] .= " overriddenpermission";
-            }
-        }
-        return $rowattributes;
-    }
-
     protected function load_parent_permissions() {
         // Get the capabilities from the parent context, so that can be shown in the interface.
         $parentcontext = $this->context->get_parent_context();

admin/roles/classes/permissions_table.php

@@ -93,10 +93,9 @@ class core_role_permissions_table extends core_role_capability_table_base {
         foreach ($roles as $id => $name) {
             if (isset($needed[$id])) {
                 $templatecontext = array("rolename" => $name, "roleid" => $id, "action" => "prevent", "spanclass" => "allowed",
-                                  "linkclass" => "preventlink", "adminurl" => $adminurl->out(), "icon" => "", "iconalt" => "");
+                                  "linkclass" => "preventlink", "adminurl" => $adminurl->out(), "imageurl" => "");
                 if (isset($overridableroles[$id]) and ($allowoverrides or ($allowsafeoverrides and is_safe_capability($capability)))) {
-                    $templatecontext['icon'] = 't/delete';
-                    $templatecontext['iconalt'] = get_string('delete');
+                    $templatecontext['imageurl'] = $renderer->pix_url('t/delete');
                 }
                 $neededroles[$id] = $renderer->render_from_template('core/permissionmanager_role', $templatecontext);
             }
@@ -106,10 +105,9 @@ class core_role_permissions_table extends core_role_capability_table_base {
             if (isset($forbidden[$id])  and ($allowoverrides or ($allowsafeoverrides and is_safe_capability($capability)))) {
                 $templatecontext = array("rolename" => $name, "roleid" => $id, "action" => "unprohibit",
                                 "spanclass" => "forbidden", "linkclass" => "unprohibitlink", "adminurl" => $adminurl->out(),
-                                "icon" => "", "iconalt" => "");
+                                "imageurl" => "");
                 if (isset($overridableroles[$id]) and prohibit_is_removable($id, $context, $capability->name)) {
-                    $templatecontext['icon'] = 't/delete';
-                    $templatecontext['iconalt'] = get_string('delete');
+                    $templatecontext['imageurl'] = $renderer->pix_url('t/delete');
                 }
                 $forbiddenroles[$id] = $renderer->render_from_template('core/permissionmanager_role', $templatecontext);
             }

admin/roles/manage.php

@@ -216,9 +216,9 @@ die;
 function get_action_icon($url, $icon, $alt, $tooltip) {
     global $OUTPUT;
     return '<a title="' . $tooltip . '" href="'. $url . '">' .
-            $OUTPUT->pix_icon('t/' . $icon, $alt) . '</a> ';
+            '<img src="' . $OUTPUT->pix_url('t/' . $icon) . '" class="iconsmall" alt="' . $alt . '" /></a> ';
 }
 function get_spacer() {
     global $OUTPUT;
-    return $OUTPUT->spacer();
+    return '<img src="' . $OUTPUT->pix_url('spacer') . '" class="iconsmall" alt="" /> ';
 }

admin/roles/tests/behat/override_roles_highlighting.feature

@@ -1,21 +0,0 @@
-@core @core_admin @core_admin_roles
-Feature: Highlight non-inherited permissions
-  In order that the status of capabilities can be more easily seen
-  As an admin
-  I need altered permissions to be highlighted
-
-  Background:
-    Given the following "courses" exist:
-      | fullname        | shortname   |
-      | Course fullname | C_shortname |
-    And I log in as "admin"
-
-  @javascript
-  Scenario: Override a permission
-    Given I am on "Course fullname" course homepage
-    And I navigate to "Users > Permissions" in current page administration
-    And I select "Manager (0)" from the "roleid" singleselect
-    And I click on "Prohibit" "radio" in the "View added and updated modules in recent activity block" "table_row"
-    And I press "Save changes"
-    And I select "Manager (1)" from the "roleid" singleselect
-    Then the "class" attribute of "View added and updated modules in recent activity block" "table_row" should contain "overriddenpermission"

admin/roles/usersroles.php

@@ -193,8 +193,10 @@ function print_report_tree($contextid, $contexts, $systemcontext, $fullname, $al
                 $strgoto = get_string('gotoassignroles', 'core_role', $a);
                 $strcheck = get_string('checkuserspermissionshere', 'core_role', $a);
             }
-            echo ' <a title="' . $strgoto . '" href="' . $raurl . '">' . $OUTPUT->pix_icon('t/edit', 'core', $stredit) . '</a> ';
-            echo ' <a title="' . $strcheck . '" href="' . $churl . '">' . $OUTPUT->pix_icon('t/preview', 'core', $strcheckpermissions) . '</a> ';
+            echo ' <a title="' . $strgoto . '" href="' . $raurl . '"><img class="iconsmall" src="' .
+                    $OUTPUT->pix_url('t/edit') . '" alt="' . $stredit . '" /></a> ';
+            echo ' <a title="' . $strcheck . '" href="' . $churl . '"><img class="iconsmall" src="' .
+                    $OUTPUT->pix_url('t/preview') . '" alt="' . $strcheckpermissions . '" /></a> ';
             echo "</p>\n";
         }
     }

admin/settings/courses.php

@@ -133,7 +133,7 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
     // Completion tracking.
     $temp->add(new admin_setting_heading('progress', new lang_string('completion','completion'), ''));
     $temp->add(new admin_setting_configselect('moodlecourse/enablecompletion', new lang_string('completion', 'completion'),
-        new lang_string('enablecompletion_help', 'completion'), 1, array(0 => new lang_string('no'), 1 => new lang_string('yes'))));
+        new lang_string('enablecompletion_help', 'completion'), 0, array(0 => new lang_string('no'), 1 => new lang_string('yes'))));
 
     // Groups.
     $temp->add(new admin_setting_heading('groups', new lang_string('groups', 'group'), ''));
@@ -343,105 +343,4 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
     //$temp->add(new admin_setting_configcheckbox('backup/backup_auto_blogs', new lang_string('blogs', 'blog'), new lang_string('backupblogshelp','blog'), 0));
 
     $ADMIN->add('backups', $temp);
-
-    // Create a page for general restore configuration and defaults.
-    $temp = new admin_settingpage('restoregeneralsettings', new lang_string('generalrestoredefaults', 'backup'));
-
-    // General restore defaults.
-    $temp->add(new admin_setting_heading('generalsettings', new lang_string('generalrestoresettings', 'backup'), ''));
-
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_users',
-        new lang_string('generalusers', 'backup'), new lang_string('configrestoreusers', 'backup'),
-        array('value' => 1, 'locked' => 0)));
-    // Can not use actual constants here because we'd need to include 100 of backup/restore files.
-    $options = [
-        0/*backup::ENROL_NEVER*/     => get_string('rootsettingenrolments_never', 'backup'),
-        1/*backup::ENROL_WITHUSERS*/ => get_string('rootsettingenrolments_withusers', 'backup'),
-        2/*backup::ENROL_ALWAYS*/    => get_string('rootsettingenrolments_always', 'backup'),
-    ];
-    $temp->add(new admin_setting_configselect_with_lock('restore/restore_general_enrolments',
-        new lang_string('generalenrolments', 'backup'), new lang_string('configrestoreenrolments', 'backup'),
-        array('value' => 1/*backup::ENROL_WITHUSERS*/, 'locked' => 0), $options));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_role_assignments',
-        new lang_string('generalroleassignments', 'backup'),
-        new lang_string('configrestoreroleassignments', 'backup'), array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_activities',
-        new lang_string('generalactivities', 'backup'),
-        new lang_string('configrestoreactivities', 'backup'), array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_blocks',
-        new lang_string('generalblocks', 'backup'),
-        new lang_string('configrestoreblocks', 'backup'), array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_filters',
-        new lang_string('generalfilters', 'backup'),
-        new lang_string('configrestorefilters', 'backup'), array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_comments',
-        new lang_string('generalcomments', 'backup'),
-        new lang_string('configrestorecomments', 'backup'), array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_badges',
-        new lang_string('generalbadges', 'backup'),
-        new lang_string('configrestorebadges', 'backup'), array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_calendarevents',
-        new lang_string('generalcalendarevents', 'backup'),
-        new lang_string('configrestorecalendarevents', 'backup'), array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_userscompletion',
-        new lang_string('generaluserscompletion', 'backup'),
-        new lang_string('configrestoreuserscompletion', 'backup'), array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_logs',
-        new lang_string('generallogs', 'backup'),
-        new lang_string('configrestorelogs', 'backup'), array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_histories',
-        new lang_string('generalhistories', 'backup'),
-        new lang_string('configrestorehistories', 'backup'), array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_groups',
-        new lang_string('generalgroups', 'backup'), new lang_string('configrestoregroups', 'backup'),
-        array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_competencies',
-        new lang_string('generalcompetencies', 'backup'),
-        new lang_string('configrestorecompetencies', 'backup'), array('value' => 1, 'locked' => 0)));
-
-    // Restore defaults when merging into another course.
-    $temp->add(new admin_setting_heading('mergerestoredefaults', new lang_string('mergerestoredefaults', 'backup'), ''));
-
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_merge_overwrite_conf',
-        new lang_string('setting_overwrite_conf', 'backup'),
-    new lang_string('config_overwrite_conf', 'backup'), array('value' => 0, 'locked' => 0)));
-
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_merge_course_fullname',
-        new lang_string('setting_overwrite_course_fullname', 'backup'),
-        new lang_string('config_overwrite_course_fullname', 'backup'), array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_merge_course_shortname',
-        new lang_string('setting_overwrite_course_shortname', 'backup'),
-        new lang_string('config_overwrite_course_shortname', 'backup'), array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_merge_course_startdate',
-        new lang_string('setting_overwrite_course_startdate', 'backup'),
-        new lang_string('config_overwrite_course_startdate', 'backup'), array('value' => 1, 'locked' => 0)));
-
-    // Restore defaults when replacing course contents.
-    $temp->add(new admin_setting_heading('replacerestoredefaults', new lang_string('replacerestoredefaults', 'backup'), ''));
-
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_replace_overwrite_conf',
-        new lang_string('setting_overwrite_conf', 'backup'),
-        new lang_string('config_overwrite_conf', 'backup'), array('value' => 0, 'locked' => 0)));
-
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_replace_course_fullname',
-        new lang_string('setting_overwrite_course_fullname', 'backup'),
-        new lang_string('config_overwrite_course_fullname', 'backup'), array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_replace_course_shortname',
-        new lang_string('setting_overwrite_course_shortname', 'backup'),
-        new lang_string('config_overwrite_course_shortname', 'backup'), array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_replace_course_startdate',
-        new lang_string('setting_overwrite_course_startdate', 'backup'),
-        new lang_string('config_overwrite_course_startdate', 'backup'), array('value' => 1, 'locked' => 0)));
-
-    $temp->add(new admin_setting_configselect_with_lock('restore/restore_replace_keep_roles_and_enrolments',
-        new lang_string('setting_keep_roles_and_enrolments', 'backup'),
-        new lang_string('config_keep_roles_and_enrolments', 'backup'), array('value' => 0, 'locked' => 0),
-        array(1 => get_string('yes'), 0 => get_string('no'))));
-    $temp->add(new admin_setting_configselect_with_lock('restore/restore_replace_keep_groups_and_groupings',
-        new lang_string('setting_keep_groups_and_groupings', 'backup'),
-        new lang_string('config_keep_groups_and_groupings', 'backup'), array('value' => 0, 'locked' => 0),
-        array(1 => get_string('yes'), 0 => get_string('no'))));
-
-    $ADMIN->add('backups', $temp);
-
 }

admin/settings/plugins.php

@@ -230,19 +230,6 @@ if ($hassiteconfig) {
         300, PARAM_INT, 10));
     $ADMIN->add('mediaplayers', $temp);
 
-    // Convert plugins.
-    $ADMIN->add('modules', new admin_category('fileconverterplugins', new lang_string('type_fileconverter_plural', 'plugin')));
-    $temp = new admin_settingpage('managefileconverterplugins', new lang_string('type_fileconverter', 'plugin'));
-    $temp->add(new admin_setting_manage_fileconverter_plugins());
-    $ADMIN->add('fileconverterplugins', $temp);
-
-    $plugins = core_plugin_manager::instance()->get_plugins_of_type('fileconverter');
-    core_collator::asort_objects_by_property($plugins, 'displayname');
-    foreach ($plugins as $plugin) {
-        /** @var \core\plugininfo\media $plugin */
-        $plugin->load_settings($ADMIN, 'fileconverterplugins', $hassiteconfig);
-    }
-
     $plugins = core_plugin_manager::instance()->get_plugins_of_type('media');
     core_collator::asort_objects_by_property($plugins, 'displayname');
     foreach ($plugins as $plugin) {

admin/settings/security.php

@@ -59,8 +59,6 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $temp->add(new admin_setting_configcheckbox('cronclionly', new lang_string('cronclionly', 'admin'), new lang_string
             ('configcronclionly', 'admin'), 1));
     $temp->add(new admin_setting_configpasswordunmask('cronremotepassword', new lang_string('cronremotepassword', 'admin'), new lang_string('configcronremotepassword', 'admin'), ''));
-    $temp->add(new admin_setting_configcheckbox('tool_task/enablerunnow', new lang_string('enablerunnow', 'tool_task'),
-            new lang_string('enablerunnow_desc', 'tool_task'), 1));
 
     $options = array(0=>get_string('no'), 3=>3, 5=>5, 7=>7, 10=>10, 20=>20, 30=>30, 50=>50, 100=>100);
     $temp->add(new admin_setting_configselect('lockoutthreshold', new lang_string('lockoutthreshold', 'admin'), new lang_string('lockoutthreshold_desc', 'admin'), 0, $options));
@@ -119,6 +117,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $temp->add(new admin_setting_configcheckbox('cookiesecure', new lang_string('cookiesecure', 'admin'), new lang_string('configcookiesecure', 'admin'), 1));
     $temp->add(new admin_setting_configcheckbox('cookiehttponly', new lang_string('cookiehttponly', 'admin'), new lang_string('configcookiehttponly', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('allowframembedding', new lang_string('allowframembedding', 'admin'), new lang_string('allowframembedding_help', 'admin'), 0));
+    $temp->add(new admin_setting_configcheckbox('loginpasswordautocomplete', new lang_string('loginpasswordautocomplete', 'admin'), new lang_string('loginpasswordautocomplete_help', 'admin'), 0));
 
     // Settings elements used by the \core\files\curl_security_helper class.
     $temp->add(new admin_setting_configmixedhostiplist('curlsecurityblockedhosts',

admin/settings/server.php

@@ -12,6 +12,7 @@ $temp->add(new admin_setting_configexecutable('pathtodu', new lang_string('patht
 $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'));
+$temp->add(new admin_setting_configexecutable('pathtounoconv', new lang_string('pathtounoconv', 'admin'), new lang_string('pathtounoconv_help', 'admin'), '/usr/bin/unoconv'));
 $ADMIN->add('server', $temp);
 
 

admin/settings/subsystems.php

@@ -54,10 +54,4 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
 
     $optionalsubsystems->add(new admin_setting_configcheckbox('enableglobalsearch', new lang_string('enableglobalsearch', 'admin'),
         new lang_string('enableglobalsearch_desc', 'admin'), 0, 1, 0));
-
-    $choices = array();
-    $choices[0] = new lang_string('no');
-    $choices[1] = new lang_string('yes');
-    $optionalsubsystems->add(new admin_setting_configselect('allowstealth', new lang_string('allowstealthmodules'),
-        new lang_string('allowstealthmodules_help'), 0, $choices));
 }

admin/templates/setting_configmultiselect_optgroup.mustache

@@ -1,71 +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/>.
-}}
-{{!
-    @template core_admin/setting_configmultiselect_optgroup
-
-    Admin multiselect setting template with optgroup support.
-
-    Context variables required for this template:
-    * name - form element name
-    * id - element id
-    * size - element size
-    * options - list of options not grouped
-    * optgroups - list of options grouped containing the group label and for each option: name, value, selected
-
-    Example context (json):
-    {
-        "name": "test",
-        "id": "test0",
-        "size": "3",
-        "options": [
-            { "name": "Option 1", "value": "V", "selected": false },
-            { "name": "Option 2", "value": "V", "selected": true }
-        ],
-        "optgroups": [
-            {
-                "label": "Group 1",
-                "options": [
-                    { "name": "Option 3", "value": "V", "selected": false },
-                    { "name": "Option 4", "value": "V", "selected": true }
-                ]
-            },
-            {
-                "label": "Group 2",
-                "options": [
-                    { "name": "Option 5", "value": "V", "selected": false },
-                    { "name": "Option 6", "value": "V", "selected": true }
-                ]
-            }
-        ]
-    }
-}}
-<div class="form-select">
-    <input type="hidden" name="{{name}}[xxxxx]" value="1">
-    <select id="{{id}}" name="{{name}}[]" size="{{size}}" multiple>
-        {{#options}}
-            <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
-        {{/options}}
-        {{#optgroups}}
-            <optgroup label="{{label}}">
-                {{#options}}
-                    <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
-                {{/options}}
-            </optgroup>
-        {{/optgroups}}
-    </select>
-</div>
-

admin/templates/setting_configselect_optgroup.mustache

@@ -1,68 +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/>.
-}}
-{{!
-    @template core_admin/setting_configselect_optgroup
-
-    Admin select with optgroup setting template.
-
-    Context variables required for this template:
-    * name - form element name
-    * id - element id
-    * options - list of options (not grouped)
-    * optgroups - list of options grouped containing the group label and for each option: name, value, selected
-
-    Example context (json):
-    {
-        "name": "test",
-        "id": "test0",
-        "options": [
-            { "name": "Option 1", "value": "V", "selected": false },
-            { "name": "Option 2", "value": "V", "selected": false }
-        ],
-        "optgroups": [
-            {
-                "label": "Group 1",
-                "options": [
-                    { "name": "Option 3", "value": "V", "selected": true },
-                    { "name": "Option 4", "value": "V", "selected": false }
-                ]
-            },
-            {
-                "label": "Group 2",
-                "options": [
-                    { "name": "Option 5", "value": "V", "selected": false },
-                    { "name": "Option 6", "value": "V", "selected": false }
-                ]
-            }
-        ]
-    }
-}}
-<div class="form-select defaultsnext">
-    <select id="{{id}}" name="{{name}}">
-        {{#options}}
-            <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
-        {{/options}}
-        {{#optgroups}}
-            <optgroup label="{{label}}">
-                {{#options}}
-                    <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
-                {{/options}}
-            </optgroup>
-        {{/optgroups}}
-    </select>
-</div>
-

admin/templates/setting_configtext.mustache

@@ -38,5 +38,5 @@
     }
 }}
 <div class="form-text defaultsnext">
-    <input type="text" name="{{name}}" value="{{value}}" size="{{size}}" id="{{id}}" class="{{#forceltr}}text-ltr{{/forceltr}}"{{#attributes}} {{name}}="{{value}}"{{/attributes}}>
+    <input type="text" name="{{name}}" value="{{value}}" size="{{size}}" id="{{id}}" class="{{#forceltr}}text-ltr{{/forceltr}}" {{#attributes}} {{name}}="{{value}}"{{/attributes}}>
 </div>

admin/templates/setting_manage_plugins.mustache

@@ -1,65 +0,0 @@
-<table class="admintable generaltable">
-    <thead>
-        <tr>
-            <th class="header">{{#str}}name, moodle{{/str}}</th>
-            {{#infocolumnname}}
-            <th class="header">{{infocolumnname}}</th>
-            {{/infocolumnname}}
-            <th class="header">{{#str}}order, moodle{{/str}}</th>
-            <th class="header">{{#str}}isenabled, plugin{{/str}}</th>
-            <th class="header">{{#str}}settings, moodle{{/str}}</th>
-            <th class="header">{{#str}}uninstall, plugin{{/str}}</th>
-        </tr>
-    </thead>
-    <tbody>
-        {{#plugins}}
-        <tr>
-            <td>{{plugin}}</td>
-            {{#infocolumnname}}
-            <td>
-                {{info}}
-            </td>
-            {{/infocolumnname}}
-            <td class="text-nowrap">
-                {{#moveuplink}}
-                    <a href="{{{moveuplink}}}">
-                        {{#pix}}t/up, moodle, {{#str}} up, moodle {{/str}}{{/pix}}
-                    </a>
-                {{/moveuplink}}
-                {{^moveuplink}}
-                    {{#pix}}spacer, moodle{{/pix}}
-                {{/moveuplink}}
-
-                {{#movedownlink}}
-                    <a href="{{{movedownlink}}}">
-                        {{#pix}}t/down, moodle, {{#str}} down, moodle {{/str}}{{/pix}}
-                    </a>
-                {{/movedownlink}}
-                {{^movedownlink}}
-                    {{#pix}}spacer, moodle{{/pix}}
-                {{/movedownlink}}
-            </td>
-            <td>
-                <a href="{{{togglelink}}}">
-                    {{#toggletarget}}
-                    {{#pix}}i/show, moodle, {{#str}} enable, moodle {{/str}}{{/pix}}
-                    {{/toggletarget}}
-                    {{^toggletarget}}
-                    {{#pix}}i/hide, moodle, {{#str}} disable, moodle {{/str}}{{/pix}}
-                    {{/toggletarget}}
-                </a>
-            </td>
-            <td>
-                {{#settingslink}}
-                    <a href="{{{settingslink}}}">{{#str}}settings,plugin{{/str}}</a>
-                {{/settingslink}}
-            </td>
-            <td>
-                {{#uninstalllink}}
-                    <a href="{{{uninstalllink}}}">{{#str}}uninstall,plugin{{/str}}</a>
-                {{/uninstalllink}}
-            </td>
-        </tr>
-        {{/plugins}}
-    </tbody>
-</table>

admin/tool/availabilityconditions/index.php

@@ -103,9 +103,18 @@ foreach ($plugins as $plugin => $name) {
 
     // Make enable control. This is a POST request (using a form control rather
     // than just a link) because it makes a database change.
-    $params = array('sesskey' => sesskey(), 'plugin' => $plugin, 'action' => $enabledaction);
-    $url = new moodle_url('/' . $CFG->admin . '/tool/availabilityconditions/', $params);
-    $enablecontrol = html_writer::link($url, $OUTPUT->pix_icon('t/' . $enabledaction, $enabledstr));
+    $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));
 }

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

@@ -37,19 +37,21 @@ Feature: Manage availability conditions
     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 "Hide" "icon" should exist in the "Restriction by date" "table_row"
+    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 "Hide" "icon" in the "Restriction by date" "table_row"
-    And "Show" "icon" should exist in the "Restriction by date" "table_row"
+    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 "Show" "icon" in the "Restriction by date" "table_row"
-    And "Hide" "icon" should exist in the "Restriction by date" "table_row"
+    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 "Hide" "icon" in the "Restriction by grade" "table_row"
-    And I am on "Course 1" course homepage with editing mode on
+    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"

admin/tool/behat/cli/run.php

@@ -54,8 +54,6 @@ list($options, $unrecognised) = cli_get_params(
         'fromrun'  => 1,
         'torun'    => 0,
         'single-run' => false,
-        'rerun' => 0,
-        'auto-rerun' => 0,
     ),
     array(
         'h' => 'help',
@@ -79,8 +77,6 @@ Options:
 --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)
---rerun            Re-run scenarios that failed during last execution.
---auto-rerun       Automatically re-run scenarios that failed during last execution.
 
 -h, --help         Print out this help
 
@@ -95,31 +91,11 @@ if (!empty($options['help'])) {
     exit(0);
 }
 
-$parallelrun = behat_config_manager::get_behat_run_config_value('parallel');
+$parallelrun = behat_config_manager::get_parallel_test_runs($options['fromrun']);
 
-// Check if the options provided are valid to run behat.
-if ($parallelrun === false) {
-    // Parallel run should not have fromrun or torun options greater than 1.
-    if (($options['fromrun'] > 1) || ($options['torun'] > 1)) {
-        echo "Test site is not initialized  for parallel run." . PHP_EOL;
-        exit(1);
-    }
-} else {
-    // Ensure fromrun is within limits of initialized test site.
-    if (!empty($options['fromrun']) && ($options['fromrun'] > $parallelrun)) {
-        echo "From run (" . $options['fromrun'] . ") is more than site with parallel runs (" . $parallelrun . ")" . PHP_EOL;
-        exit(1);
-    }
-
-    // Default torun is maximum parallel runs and should be less than equal to parallelruns.
-    if (empty($options['torun'])) {
-        $options['torun'] = $parallelrun;
-    } else {
-        if ($options['torun'] > $parallelrun) {
-            echo "To run (" . $options['torun'] . ") is more than site with parallel runs (" . $parallelrun . ")" . PHP_EOL;
-            exit(1);
-        }
-    }
+// Default torun is maximum parallel runs.
+if (empty($options['torun'])) {
+    $options['torun'] = $parallelrun;
 }
 
 // Capture signals and ensure we clean symlinks.
@@ -151,7 +127,7 @@ if ($options['profile']) {
         exit(1);
     }
 
-    $extraopts['profile'] = '--profile="' . $profile . '"';
+    $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'];
@@ -161,206 +137,117 @@ if ($options['profile']) {
 // Command line tags have precedence (std behat behavior).
 if ($options['tags']) {
     $tags = $options['tags'];
-    $extraopts['tags'] = '--tags="' . $tags . '"';
+    $extraopts[] = '--tags="' . $tags . '"';
 }
 
 // Add suite option if specified.
 if ($options['suite']) {
-    $extraopts['suite'] = '--suite="' . $options['suite'] . '"';
+    $extraopts[] = '--suite="' . $options['suite'] . '"';
 }
 
 // Feature should be added to last, for behat command.
 if ($options['feature']) {
-    $extraopts['feature'] = $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.
-$extraoptstr = implode(' ', $extraopts);
+$extraopts = implode(' ', $extraopts);
 
-// If rerun is passed then ensure we just run the failed processes.
-$lastfailedstatus = 0;
-$lasttorun = $options['torun'];
-$lastfromrun = $options['fromrun'];
-if ($options['rerun']) {
-    // Get last combined failed status.
-    $lastfailedstatus = behat_config_manager::get_behat_run_config_value('lastcombinedfailedstatus');
-    $lasttorun = behat_config_manager::get_behat_run_config_value('lasttorun');
-    $lastfromrun = behat_config_manager::get_behat_run_config_value('lastfromrun');
-
-    if ($lastfailedstatus !== false) {
-        $extraoptstr .= ' --rerun';
-    }
-
-    // If torun is less than last torun, then just set this to min last to run and similar for fromrun.
-    if ($options['torun'] < $lasttorun) {
-        $options['torun'];
-    }
-    if ($options['fromrun'] > $lastfromrun) {
-        $options['fromrun'];
-    }
-    unset($options['rerun']);
-}
-
-$cmds = array();
-$exitcodes = array();
-$status = 0;
-$verbose = empty($options['verbose']) ? false : true;
-
-// Execute behat run commands.
+// 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 .= ' ' . $extraoptstr;
-    $cmds['singlerun'] = $runtestscommand;
-
+    $runtestscommand .= ' ' . $extraopts;
     echo "Running single behat site:" . PHP_EOL;
-    passthru("php $runtestscommand", $status);
-    $exitcodes['singlerun'] = $status;
+    passthru("php $runtestscommand", $code);
     chdir($cwd);
-} else {
-
-    echo "Running " . ($options['torun'] - $options['fromrun'] + 1) . " parallel behat sites:" . PHP_EOL;
-
-    for ($i = $options['fromrun']; $i <= $options['torun']; $i++) {
-        $lastfailed = 1 & $lastfailedstatus >> ($i - 1);
-
-        // Bypass if not failed in last run.
-        if ($lastfailedstatus && !$lastfailed && ($i <= $lasttorun) && ($i >= $lastfromrun)) {
-            continue;
-        }
-
-        $CFG->behatrunprocess = $i;
-
-        // Options parameters to be added to each run.
-        $myopts = !empty($options['replace']) ? str_replace($options['replace'], $i, $extraoptstr) : $extraoptstr;
-
-        $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);
-    }
-
-    // Save torun and from run, so it can be used to detect if it was executed in last run.
-    behat_config_manager::set_behat_run_config_value('lasttorun', $options['torun']);
-    behat_config_manager::set_behat_run_config_value('lastfromrun', $options['fromrun']);
-
-    // Keep no delay by default, between each parallel, let user decide.
-    if (!defined('BEHAT_PARALLEL_START_DELAY')) {
-        define('BEHAT_PARALLEL_START_DELAY', 0);
-    }
-
-    // Execute all commands, relative to moodle root directory.
-    $processes = cli_execute_parallel($cmds, __DIR__ . "/../../../../", BEHAT_PARALLEL_START_DELAY);
-    $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 to finish run.
-    $time = round(microtime(true) - $time, 1);
-    echo "Finished in " . gmdate("G\h i\m s\s", $time) . PHP_EOL . PHP_EOL;
-    ksort($exitcodes);
-
-    // Print exit info from each run.
-    // Status bits contains pass/fail status of parallel runs.
-    foreach ($exitcodes as $name => $exitcode) {
-        if ($exitcode) {
-            $runno = str_replace(BEHAT_PARALLEL_SITE_NAME, '', $name);
-            $status |= (1 << ($runno - 1));
-        }
-    }
-
-    // Print each process information.
-    print_each_process_info($processes, $verbose, $status);
+    exit($code);
 }
 
-// Save final exit code containing which run failed.
-behat_config_manager::set_behat_run_config_value('lastcombinedfailedstatus', $status);
+$cmds = array();
+echo "Running " . ($options['torun'] - $options['fromrun'] + 1) . " parallel behat sites:" . PHP_EOL;
 
-// Show exit code from each process, if any process failed and how to rerun failed process.
-if ($verbose || $status) {
-    // Check if status of last run is failure and rerun is suggested.
-    if (!empty($options['auto-rerun']) && $status) {
-        // Rerun for the number of tries passed.
-        for ($i = 0; $i < $options['auto-rerun']; $i++) {
+for ($i = $options['fromrun']; $i <= $options['torun']; $i++) {
+    $CFG->behatrunprocess = $i;
 
-            // Run individual commands, to avoid parallel failures.
-            foreach ($exitcodes as $behatrunname => $exitcode) {
-                // If not failed in last run, then skip.
-                if ($exitcode == 0) {
-                    continue;
-                }
+    // Options parameters to be added to each run.
+    $myopts = !empty($options['replace']) ? str_replace($options['replace'], $i, $extraopts) : $extraopts;
 
-                // This was a failure.
-                echo "*** Re-running behat run: $behatrunname ***" . PHP_EOL;
-                if ($verbose) {
-                    echo "Executing: " . $cmds[$behatrunname] . " --rerun" . PHP_EOL;
-                }
+    $behatcommand = behat_command::get_behat_command(false, false, true);
+    $behatconfigpath = behat_config_manager::get_behat_cli_config_filepath($i);
 
-                passthru("php $cmds[$behatrunname] --rerun", $rerunstatus);
+    // 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;
+}
 
-                // Update exit code.
-                $exitcodes[$behatrunname] = $rerunstatus;
-            }
-        }
+if (empty($cmds)) {
+    echo "No commands to execute " . PHP_EOL;
+    exit(1);
+}
 
-        // Update status after auto-rerun finished.
-        $status = 0;
-        foreach ($exitcodes as $name => $exitcode) {
-            if ($exitcode) {
-                if (!empty($parallelrun)) {
-                    $runno = str_replace(BEHAT_PARALLEL_SITE_NAME, '', $name);
-                } else {
-                    $runno = 1;
-                }
-                $status |= (1 << ($runno - 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, relative to moodle root directory.
+$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;
+
+ksort($exitcodes);
+
+// Print exit info from each run.
+// Status bits contains pass/fail status of parallel runs.
+$status = 0;
+$processcounter = 0;
+foreach ($exitcodes as $exitcode) {
+    if ($exitcode) {
+        $status |= (1 << $processcounter);
+    }
+    $processcounter++;
+}
+
+// Run finished. Show exit code and output from individual process.
+$verbose = empty($options['verbose']) ? false : true;
+$verbose = $verbose || !empty($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;
+    foreach ($exitcodes as $run => $exitcode) {
+        echo $run . ": " . $exitcode . PHP_EOL;
     }
 
-    // Show final o/p with re-run commands.
+    // Show failed re-run commands.
     if ($status) {
-        if (!empty($parallelrun)) {
-            // Echo exit codes.
-            echo "Exit codes for each behat run: " . PHP_EOL;
-            foreach ($exitcodes as $run => $exitcode) {
-                echo $run . ": " . $exitcode . PHP_EOL;
-            }
-            unset($extraopts['fromrun']);
-            unset($extraopts['torun']);
-            if (!empty($options['replace'])) {
-                $extraopts['replace'] = '--replace="' . $options['replace'] . '"';
+        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 "To re-run failed processes, you can use following command:" . PHP_EOL;
-        $extraopts['rerun'] = '--rerun';
-        $extraoptstr = implode(' ', $extraopts);
-        echo behat_command::get_behat_command(true, true, true) . " " . $extraoptstr . PHP_EOL;
     }
     echo PHP_EOL;
 }
 
+print_each_process_info($processes, $verbose);
+
 // Remove site symlink if necessary.
 behat_config_manager::drop_parallel_site_links();
 
@@ -477,47 +364,23 @@ function print_combined_run_output($processes, $stoponfail = false) {
  * @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, $status = 0) {
+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 if ($status) {
-            // Only show failed o/p.
-            $runno = str_replace(BEHAT_PARALLEL_SITE_NAME, '', $name);
-            if ((1 << ($runno - 1)) & $status) {
-                echo $process->getOutput();
-                echo $process->getErrorOutput();
-            } else {
-                echo get_status_lines_from_run_op($process);
-            }
-
         } else {
-            echo get_status_lines_from_run_op($process);
+            $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;
     }
 }
-
-/**
- * Extract status information from behat o/p and return.
- * @param Symfony\Component\Process\Process $process
- * @return string
- */
-function get_status_lines_from_run_op(Symfony\Component\Process\Process $process) {
-    $statusstr = '';
-    $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)) {
-            $statusstr .= $line . PHP_EOL;
-        }
-    }
-
-    return $statusstr;
-}
-

admin/tool/behat/cli/util.php

@@ -36,7 +36,11 @@ define('NO_OUTPUT_BUFFERING', true);
 define('IGNORE_COMPONENT_CACHE', true);
 define('ABORT_AFTER_CONFIG', 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');
 
 // CLI options.
 list($options, $unrecognized) = cli_get_params(
@@ -99,26 +103,14 @@ if (!empty($options['help'])) {
 
 $cwd = getcwd();
 
-// If Behat parallel site is being initiliased, then define a param to be used to ignore single run install.
-if (!empty($options['parallel'])) {
-    define('BEHAT_PARALLEL_UTIL', true);
-}
-
-require_once(__DIR__ . '/../../../../config.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');
-
 // For drop option check if parallel site.
 if ((empty($options['parallel'])) && ($options['drop']) || $options['updatesteps']) {
-    $options['parallel'] = behat_config_manager::get_behat_run_config_value('parallel');
+    // Get parallel run info from first run.
+    $options['parallel'] = behat_config_manager::get_parallel_test_runs($options['fromrun']);
 }
 
 // If not a parallel site then open single run.
 if (empty($options['parallel'])) {
-    // Set run config value for single run.
-    behat_config_manager::set_behat_run_config_value('singlerun', 1);
-
     chdir(__DIR__);
     // Check if behat is initialised, if not exit.
     passthru("php util_single_run.php --diag", $status);
@@ -155,21 +147,6 @@ if ($options['diag'] || $options['enable'] || $options['disable']) {
         $status = (bool)$status || (bool)$exitcode;
     }
 
-    // Remove run config file.
-    $behatrunconfigfile = behat_config_manager::get_behat_run_config_file_path();
-    if (file_exists($behatrunconfigfile)) {
-        if (!unlink($behatrunconfigfile)) {
-            behat_error(BEHAT_EXITCODE_PERMISSIONS, 'Can not delete behat run config file');
-        }
-    }
-
-    // Remove test file path.
-    if (file_exists(behat_util::get_test_file_path())) {
-        if (!unlink(behat_util::get_test_file_path())) {
-            behat_error(BEHAT_EXITCODE_PERMISSIONS, 'Can not delete test file enable info');
-        }
-    }
-
 } else if ($options['install']) {
     // This is intensive compared to behat itself so run them in chunk if option maxruns not set.
     if ($options['maxruns']) {
@@ -256,19 +233,6 @@ if ($options['install']) {
 } 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);
-
-    // Save fromrun and to run information.
-    if (isset($options['fromrun'])) {
-        behat_config_manager::set_behat_run_config_value('fromrun', $options['fromrun']);
-    }
-
-    if (isset($options['torun'])) {
-        behat_config_manager::set_behat_run_config_value('torun', $options['torun']);
-    }
-    if (isset($options['parallel'])) {
-        behat_config_manager::set_behat_run_config_value('parallel', $options['parallel']);
-    }
-
     echo PHP_EOL;
 
 } else if ($options['disable']) {

admin/tool/behat/cli/util_single_run.php

@@ -143,7 +143,7 @@ if ($options['run']) {
     $run = $options['run'];
     // If parallel option is not passed, then try get it form config.
     if (!$options['parallel']) {
-        $parallel = behat_config_manager::get_behat_run_config_value('parallel');
+        $parallel = behat_config_manager::get_parallel_test_runs();
     } else {
         $parallel = $options['parallel'];
     }
@@ -176,7 +176,10 @@ if ($options['install']) {
 } else if ($options['enable']) {
     if (!empty($parallel)) {
         // Save parallel site info for enable and install options.
-        behat_config_manager::set_behat_run_config_value('behatsiteenabled', 1);
+        $filepath = behat_config_manager::get_parallel_test_file_path();
+        if (!file_put_contents($filepath, $parallel)) {
+            behat_error(BEHAT_EXITCODE_PERMISSIONS, 'File ' . $filepath . ' can not be created');
+        }
     }
 
     // Enable test mode.
@@ -197,7 +200,7 @@ if ($options['install']) {
     }
 
 } else if ($options['disable']) {
-    behat_util::stop_test_mode($run);
+    behat_util::stop_test_mode();
     // This is only displayed once for parallel install.
     if (empty($run)) {
         mtrace("Acceptance tests environment disabled");

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

@@ -57,7 +57,8 @@ Feature: Set up contextual data for tests
       | Grouping 1 | C1 | GG1 |
       | Grouping 2 | C1 | GG2 |
     When I log in as "admin"
-    And I am on "Course 1" course homepage
+    And I am on site homepage
+    And I follow "Course 1"
     And I navigate to "Users > Groups" in current page administration
     Then I should see "Group 1"
     And I should see "Group 2"
@@ -86,7 +87,8 @@ Feature: Set up contextual data for tests
       | mod/forum:editanypost | Allow | student | Course | C1 |
       | mod/forum:replynews | Prevent | editingteacher | Course | C1 |
     When I log in as "admin"
-    And I am on "Course 1" course homepage
+    And I am on site homepage
+    And I follow "Course 1"
     And I navigate to "Users > Permissions" in current page administration
     And I set the field "Advanced role override" to "Student (1)"
     Then "mod/forum:editanypost" capability has "Allow" permission
@@ -106,7 +108,7 @@ Feature: Set up contextual data for tests
       | user | course | role |
       | student1 | C1 | student |
     When I log in as "student1"
-    And I am on "Course 1" course homepage
+    And I follow "Course 1"
     Then I should see "Topic 1"
 
   Scenario: Add role assigns
@@ -142,20 +144,24 @@ Feature: Set up contextual data for tests
     Then "Edit settings" "link" should exist in current page administration
     And I log out
     And I log in as "user2"
-    And I am on "Course 1" course homepage
+    And I am on site homepage
+    And I follow "Course 1"
     And "Turn editing on" "link" should exist in current page administration
     And I log out
     And I log in as "user3"
-    And I am on "Course 1" course homepage
+    And I am on site homepage
+    And I follow "Course 1"
     And "Turn editing on" "link" should exist in current page administration
     And I log out
     And I log in as "user4"
-    And I am on "Course 1" course homepage
+    And I am on site homepage
+    And I follow "Course 1"
     And "Turn editing on" "link" should exist in current page administration
     And I log out
     And I log in as "user5"
     And I should see "You are logged in as"
-    And I am on "Course 1" course homepage
+    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
@@ -193,7 +199,8 @@ Feature: Set up contextual data for tests
       | 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 "Course 1" course homepage
+    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
     # And I should see "Test assignment22 name"
@@ -254,7 +261,8 @@ Feature: Set up contextual data for tests
       | grouping | group |
       | GG1 | G1 |
     When I log in as "admin"
-    And I am on "Course 1" course homepage
+    And I am on site homepage
+    And I follow "Course 1"
     And I navigate to "Users > Groups" in current page administration
     Then the "groups" select box should contain "Group 1 (1)"
     And the "groups" select box should contain "Group 2 (1)"
@@ -313,7 +321,7 @@ Feature: Set up contextual data for tests
       | Grade sub category 2 | C1 | Grade category 1 |
     When I log in as "admin"
     And I am on course index
-    And I am on "Course 1" course homepage
+    And I follow "Course 1"
     And I navigate to "View > Grader report" in the course gradebook
     Then I should see "Grade category 1"
     And I should see "Grade sub category 2"
@@ -336,7 +344,8 @@ Feature: Set up contextual data for tests
       | 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 "Course 1" course homepage
+    And I am on site homepage
+    And I follow "Course 1"
     And I navigate to "Setup > Gradebook setup" in the course gradebook
     Then I should see "Test Grade Item 1"
     And I follow "Edit   Test Grade Item 1"
@@ -364,7 +373,8 @@ Feature: Set up contextual data for tests
       | name | scale |
       | Test Scale 1 | Disappointing, Good, Very good, Excellent |
     When I log in as "admin"
-    And I am on "Course 1" course homepage
+    And I am on site homepage
+    And I follow "Course 1"
     And I navigate to "Scales" in the course gradebook
     Then I should see "Test Scale 1"
     And I should see "Disappointing,  Good,  Very good,  Excellent"
@@ -385,7 +395,8 @@ Feature: Set up contextual data for tests
     And the following config values are set as admin:
       | enableoutcomes | 1 |
     When I log in as "admin"
-    And I am on "Course 1" course homepage
+    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"
@@ -413,7 +424,8 @@ Feature: Set up contextual data for tests
     And the following config values are set as admin:
       | enableoutcomes | 1 |
     When I log in as "admin"
-    And I am on "Course 1" course homepage
+    And I am on site homepage
+    And I follow "Course 1"
     And I navigate to "Setup > Gradebook setup" in the course gradebook
     Then I should see "Test Outcome Grade Item 1"
     And I follow "Edit   Test Outcome Grade Item 1"
@@ -430,5 +442,6 @@ Feature: Set up contextual data for tests
       | blockname    | contextlevel | reference | pagetypepattern | defaultregion |
       | online_users | Course       | C1        | course-view-*   | site-pre      |
     When I log in as "admin"
-    And I am on "Course 1" course homepage
+    And I am on site homepage
+    And I follow "Course 1"
     Then I should see "Online users"

admin/tool/behat/tests/behat/datetime_strings.feature

@@ -19,7 +19,7 @@ Feature: Transform date time string arguments
       | user     | course | role    |
       | teacher1 | C1     | editingteacher |
     And I log in as "teacher1"
-    And I am on "Course 1" course homepage
+    And I follow "Course 1"
     And I follow "Test assignment name"
     And I should see "##yesterday##l, j F Y##"
     And I log out

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

@@ -31,7 +31,7 @@ Feature: Edit capabilities
 
   Scenario: Course capabilities overrides
     Given I log in as "teacher1"
-    And I am on "Course 1" course homepage
+    And I follow "Course 1"
     And I navigate to "Users > Permissions" in current page administration
     And I override the system permissions of "Student" role with:
       | mod/forum:deleteanypost | Prohibit |
@@ -45,7 +45,8 @@ Feature: Edit capabilities
 
   Scenario: Module capabilities overrides
     Given I log in as "teacher1"
-    And I am on "Course 1" course homepage with editing mode on
+    And I follow "Course 1"
+    And I turn editing mode on
     And I add a "Forum" to section "1" and I fill the form with:
       | Forum name | I'm the name |
       | Description | I'm the introduction |

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

@@ -33,7 +33,8 @@ Feature: Verify that all form fields values can be get and set
       | 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 am on "Course 1" course homepage
+    And I am on site homepage
+    And I follow "Course 1"
     And I navigate to "Reset" node in "Course administration"
     # Select (multi-select) - Checking "the select box should contain".
     And I expand all fieldsets
@@ -47,7 +48,9 @@ Feature: Verify that all form fields values can be get and set
     And the "Unenrol users" select box should not contain "President"
     And the "Unenrol users" select box should not contain "Baker"
     And the "Unenrol users" select box should not contain "President, Baker"
-    And I am on "Course 1" course homepage with editing mode on
+    And I am on site homepage
+    And I follow "Course 1"
+    And I turn editing mode on
     And I follow "Test this one"
     And I press "Create page"
     # Text (textarea & editor) & Select (multi-select) - Checking "I set the following fields to these values".
@@ -97,7 +100,7 @@ Feature: Verify that all form fields values can be get and set
       | Default format | HTML |
       | Force format | 1 |
     And I press "Cancel"
-    And I am on "Course 1" course homepage
+    And I follow "Course 1"
     # Radio - Checking "I set the field" and "the field matches value".
     And I add a "Choice" to section "1" and I fill the form with:
       | Choice name | Test choice name |
@@ -112,7 +115,8 @@ Feature: Verify that all form fields values can be get and set
     And the field "one" matches value "1"
     And the field "two" matches value ""
     # Check if field xpath set/match works.
-    And I am on "Course 1" course homepage
+    And I am on site homepage
+    And I follow "Course 1"
     And I navigate to "Edit settings" node in "Course administration"
     And I set the field with xpath "//input[@id='id_idnumber']" to "Course id number"
     And the field with xpath "//input[@name='idnumber']" matches value "Course id number"
@@ -121,11 +125,12 @@ Feature: Verify that all form fields values can be get and set
     And I navigate to "Edit settings" node in "Course administration"
     And the field "Course ID number" matches value "Course id number"
 
+
   Scenario: with JS disabled all form fields getters and setters works as expected
 
   @javascript
   Scenario: with JS enabled all form fields getters and setters works as expected
-    Then I am on "Course 1" course homepage
+    Then I follow "Course 1"
     And I navigate to "Users > Groups" in current page administration
     # Select (multi-select & AJAX) - Checking "I set the field" and "select box should contain".
     And I set the field "groups" to "Group 2"
@@ -137,7 +142,7 @@ Feature: Verify that all form fields values can be get and set
     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".
-    And I am on "Course 1" course homepage
+    And I follow "Course 1"
     And I add a "Lesson" to section "1"
     And I set the following fields to these values:
       | Name | Test lesson |

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

@@ -26,3 +26,4 @@ Feature: List the system steps definitions
     Given I set the field "Contains" to "homepage"
     When I press "Filter"
     Then I should see "Opens Moodle homepage."
+

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

@@ -7,7 +7,8 @@ Feature: Forms manipulation
   @javascript
   Scenario: Basic forms manipulation
     Given I log in as "admin"
-    And I open my profile in edit mode
+    And I follow "Preferences" in the user menu
+    And I click on "Edit profile" "link" in the "region-main" "region"
     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 "New password" to "TestPass"
@@ -23,7 +24,9 @@ Feature: Forms manipulation
       | fullname | shortname | category |
       | Course 1 | C1 | 0 |
     And I log in as "admin"
-    And I am on "Course 1" course homepage with editing mode on
+    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"
     When I expand all fieldsets
     Then I should see "Close the quiz"

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

@@ -10,7 +10,8 @@ Feature: Transform steps arguments
       | fullname | shortname | category |
       | Course 1 | C1 | 0 |
     And I log in as "admin"
-    And I open my profile in edit mode
+    And I follow "Preferences" in the user menu
+    And I click on "Edit profile" "link" in the "region-main" "region"
 
   Scenario: Use nasty strings on steps arguments
     When I set the field "Surname" to "$NASTYSTRING1"

admin/tool/cohortroles/classes/api.php

@@ -149,13 +149,13 @@ class api {
         // We build an better structure to loop on.
         $info = array();
         foreach ($all as $cra) {
-            if (!isset($info[$cra->get('userid')])) {
-                $info[$cra->get('userid')] = array();
+            if (!isset($info[$cra->get_userid()])) {
+                $info[$cra->get_userid()] = array();
             }
-            if (!isset($info[$cra->get('userid')][$cra->get('roleid')])) {
-                $info[$cra->get('userid')][$cra->get('roleid')] = array();
+            if (!isset($info[$cra->get_userid()][$cra->get_roleid()])) {
+                $info[$cra->get_userid()][$cra->get_roleid()] = array();
             }
-            array_push($info[$cra->get('userid')][$cra->get('roleid')], $cra->get('cohortid'));
+            array_push($info[$cra->get_userid()][$cra->get_roleid()], $cra->get_cohortid());
         }
         // Then for each user+role combo - find user context in the cohort without a role assigned.
 

admin/tool/cohortroles/tests/api_test.php

@@ -96,10 +96,10 @@ class tool_cohortroles_api_testcase extends advanced_testcase {
             'cohortid' => $this->cohort->id
         );
         $result = api::create_cohort_role_assignment($params);
-        $this->assertNotEmpty($result->get('id'));
-        $this->assertEquals($result->get('userid'), $this->userassignto->id);
-        $this->assertEquals($result->get('roleid'), $this->roleid);
-        $this->assertEquals($result->get('cohortid'), $this->cohort->id);
+        $this->assertNotEmpty($result->get_id());
+        $this->assertEquals($result->get_userid(), $this->userassignto->id);
+        $this->assertEquals($result->get_roleid(), $this->roleid);
+        $this->assertEquals($result->get_cohortid(), $this->cohort->id);
     }
 
     /**
@@ -114,7 +114,7 @@ class tool_cohortroles_api_testcase extends advanced_testcase {
         );
         $result = api::create_cohort_role_assignment($params);
         $this->setUser($this->userassignto);
-        api::delete_cohort_role_assignment($result->get('id'));
+        api::delete_cohort_role_assignment($result->get_id());
     }
 
     /**
@@ -128,7 +128,7 @@ class tool_cohortroles_api_testcase extends advanced_testcase {
             'cohortid' => $this->cohort->id
         );
         $result = api::create_cohort_role_assignment($params);
-        api::delete_cohort_role_assignment($result->get('id') + 1);
+        api::delete_cohort_role_assignment($result->get_id() + 1);
     }
 
     public function test_delete_cohort_role_assignment() {
@@ -139,7 +139,7 @@ class tool_cohortroles_api_testcase extends advanced_testcase {
             'cohortid' => $this->cohort->id
         );
         $result = api::create_cohort_role_assignment($params);
-        $worked = api::delete_cohort_role_assignment($result->get('id'));
+        $worked = api::delete_cohort_role_assignment($result->get_id());
         $this->assertTrue($worked);
     }
 

admin/tool/filetypes/classes/utils.php

@@ -97,7 +97,7 @@ class utils {
         if ($handle = @opendir($path)) {
             while (($file = readdir($handle)) !== false) {
                 $matches = array();
-                if (preg_match('~(.+?)(?:-24|-32|-48|-64|-72|-80|-96|-128|-256)?\.(?:svg|gif|png)$~',
+                if (preg_match('~(.+?)(?:-24|-32|-48|-64|-72|-80|-96|-128|-256)?\.(?:gif|png)$~',
                         $file, $matches)) {
                     $key = $matches[1];
                     $icons[$key] = $key;

admin/tool/filetypes/renderer.php

@@ -116,7 +116,7 @@ class tool_filetypes_renderer extends plugin_renderer_base {
                         $editurl = new \moodle_url('/admin/tool/filetypes/edit.php',
                                 array('oldextension' => $extension));
                         $editbutton = html_writer::link($editurl, $this->pix_icon('t/edit',
-                                get_string('edita', 'moodle', s($extension))));
+                                get_string('edita', '', s($extension))));
                         $deleteurl = new \moodle_url('/admin/tool/filetypes/delete.php',
                                 array('extension' => $extension));
                         $deletebutton = html_writer::link($deleteurl, $this->pix_icon('t/delete',

admin/tool/filetypes/tests/behat/add_filetypes.feature

@@ -21,6 +21,7 @@ Feature: Add customised file types
     Then I should see "Froggy file" in the "application/x-frog" "table_row"
     And I should see "document" in the "application/x-frog" "table_row"
     And I should see "frog" in the "application/x-frog" "table_row"
+    And "//img[contains(@src, 'archive')]" "xpath_element" should exist in the "application/x-frog" "table_row"
 
   Scenario: Update an existing file type
     Given I log in as "admin"
@@ -98,11 +99,11 @@ Feature: Add customised file types
     And I navigate to "File types" node in "Site administration > Server"
     And I click on "Edit 7z" "link"
     And I set the following fields to these values:
-      | Type groups | document |
+      | File icon | document |
     And I press "Save changes"
-    And I follow "Restore 7z to Moodle defaults"
+    When I follow "Restore 7z to Moodle defaults"
     And I press "Yes"
-    Then "//*[contains(text(), 'archive')]" "xpath_element" should exist in the "7z" "table_row"
+    Then "//img[contains(@src, 'archive')]" "xpath_element" should exist in the "7z" "table_row"
 
   @javascript @_file_upload
   Scenario: Create a resource activity which contains a customised file type
@@ -120,7 +121,9 @@ Feature: Add customised file types
       | Custom description | Froggy file                               |
     And I press "Save changes"
     # Create a resource activity and add it to a course
-    And I am on "Course 1" course homepage with editing mode on
+    And I am on site homepage
+    And I follow "Course 1"
+    And I turn editing mode on
     When I add a "File" to section "1"
     And I set the following fields to these values:
       | Name        | An example of customised file type |
@@ -130,3 +133,4 @@ Feature: Add customised file types
     And I set the field "Show type" to "1"
     And I press "Save and return to course"
     Then I should see "Froggy file"
+    And the "src" attribute of ".modtype_resource a img" "css_element" should contain "archive"

admin/tool/langimport/classes/controller.php

@@ -208,17 +208,6 @@ class controller {
         }
         return false;
     }
-
-    /**
-     * Returns the URL where a given language pack can be downloaded
-     *
-     * Alternatively, if the parameter is empty, returns URL of the page with the
-     * list of all available language packs.
-     *
-     * @param string $langcode language code like 'cs' or empty for unknown
-     * @return string URL
-     */
-    public function lang_pack_url($langcode = '') {
-        return $this->installer->lang_pack_url($langcode);
-    }
 }
+
+

admin/tool/langimport/classes/output/langimport_page.php

@@ -1,110 +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/>.
-
-/**
- * Language import page.
- *
- * @package    tool_langimport
- * @copyright  2016 Jun Pataleta
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-namespace tool_langimport\output;
-defined('MOODLE_INTERNAL') || die();
-
-use moodle_url;
-use renderable;
-use renderer_base;
-use stdClass;
-use templatable;
-
-/**
- * Language import page class.
- *
- * @package    tool_langimport
- * @copyright  2016 Jun Pataleta
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class langimport_page implements renderable, templatable {
-
-    /** @var array Array of currently installed languages. */
-    protected $installedlanguages;
-
-    /** @var array Array of languages that can be installed. */
-    protected $availablelanguages;
-
-    /** @var moodle_url The URL to be used for uninstalling the selected existing language packs. */
-    protected $uninstallurl;
-
-    /** @var moodle_url The URL to be used for updating the installed language packs. */
-    protected $updateurl;
-
-    /** @var moodle_url The URL to be used for installing the selected language packs to be installed. */
-    protected $installurl;
-
-
-    /**
-     * langimport_page constructor.
-     *
-     * @param array $installedlanguages Array of currently installed languages.
-     * @param array $availablelanguages Array of languages that can be installed.
-     * @param moodle_url $uninstallurl The URL to be used for uninstalling the selected existing language packs.
-     * @param moodle_url $updateurl The URL to be used for updating the installed language packs.
-     * @param moodle_url $installurl The URL to be used for installing the selected language packs to be installed.
-     */
-    public function __construct($installedlanguages, $availablelanguages, $uninstallurl, $updateurl, $installurl) {
-        $this->installedlanguages = $installedlanguages;
-        $this->availablelanguages = $availablelanguages;
-        $this->uninstallurl = $uninstallurl;
-        $this->updateurl = $updateurl;
-        $this->installurl = $installurl;
-    }
-
-    /**
-     * Export the data.
-     *
-     * @param renderer_base $output
-     * @return stdClass
-     */
-    public function export_for_template(renderer_base $output) {
-        $data = new stdClass();
-        $data->uninstallurl = $this->uninstallurl;
-        $data->sesskey = sesskey();
-
-        $data->installedoptions = [];
-        foreach ($this->installedlanguages as $code => $language) {
-            $option = new stdClass();
-            $option->value = $code;
-            $option->text = $language;
-            $data->installedoptions[] = $option;
-        }
-
-        $data->updateurl = $this->updateurl;
-
-        if (!empty($this->availablelanguages)) {
-            $data->toinstalloptions = [];
-            foreach ($this->availablelanguages as $code => $language) {
-                $option = new stdClass();
-                $option->value = $code;
-                $option->text = $language;
-                $data->toinstalloptions[] = $option;
-            }
-            $data->installurl = $this->installurl;
-            $data->caninstall = true;
-        }
-
-        return $data;
-    }
-}

admin/tool/langimport/classes/output/renderer.php

@@ -1,50 +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/>.
-
-/**
- * Renderers.
- *
- * @package    tool_langimport
- * @copyright  2016 Jun Pataleta
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace tool_langimport\output;
-
-defined('MOODLE_INTERNAL') || die();
-
-use plugin_renderer_base;
-
-/**
- * Renderer class.
- *
- * @package    tool_langimport
- * @copyright  2016 Jun Pataleta
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class renderer extends plugin_renderer_base {
-
-    /**
-     * Defer to template.
-     *
-     * @param langimport_page $page
-     * @return string
-     */
-    public function render_langimport_page(langimport_page $page) {
-        $data = $page->export_for_template($this);
-        return parent::render_from_template('tool_langimport/langimport', $data);
-    }
-}

admin/tool/langimport/index.php

@@ -124,22 +124,19 @@ if ($availablelangs = $controller->availablelangs) {
 } else {
     $remote = false;
     $availablelangs = array();
-    $a = [
-        'src' => $controller->lang_pack_url(),
-        'dest' => $CFG->dataroot.'/lang/',
-    ];
-    $errormessage = get_string('downloadnotavailable', 'tool_langimport', $a);
-    \core\notification::error($errormessage);
+    echo $OUTPUT->box_start();
+    print_string('remotelangnotavailable', 'tool_langimport', $CFG->dataroot.'/lang/');
+    echo $OUTPUT->box_end();
 }
 
 if ($controller->info) {
     $info = implode('<br />', $controller->info);
-    \core\notification::success($info);
+    echo $OUTPUT->notification($info, 'notifysuccess');
 }
 
 if ($controller->errors) {
     $info = implode('<br />', $controller->errors);
-    \core\notification::error($info);
+    echo $OUTPUT->notification($info, 'notifyproblem');
 }
 
 if ($missingparents) {
@@ -154,29 +151,67 @@ if ($missingparents) {
             }
         }
         $info = get_string('missinglangparent', 'tool_langimport', $a);
-        \core\notification::error($info);
+        echo $OUTPUT->notification($info, 'notifyproblem');
     }
 }
 
-$uninstallurl = new moodle_url('/admin/tool/langimport/index.php', array('mode' => DELETION_OF_SELECTED_LANG));
-$updateurl = null;
-if ($remote) {
-    $updateurl = new moodle_url('/admin/tool/langimport/index.php', array('mode' => UPDATE_ALL_LANG));
-}
-$installurl = new moodle_url('/admin/tool/langimport/index.php', array('mode' => INSTALLATION_OF_SELECTED_LANG));
+echo $OUTPUT->box_start();
 
-// List of available languages.
+echo html_writer::start_tag('table');
+echo html_writer::start_tag('tr');
+
+// list of installed languages
+$url = new moodle_url('/admin/tool/langimport/index.php', array('mode' => DELETION_OF_SELECTED_LANG));
+echo html_writer::start_tag('td', array('valign' => 'top'));
+echo html_writer::start_tag('form', array('id' => 'uninstallform', 'action' => $url->out(), 'method' => 'post'));
+echo html_writer::start_tag('fieldset');
+echo html_writer::label(get_string('installedlangs', 'tool_langimport'), 'menuuninstalllang');
+echo html_writer::empty_tag('br');
+echo html_writer::select($installedlangs, 'uninstalllang[]', '', false, array('size' => 15, 'multiple' => 'multiple'));
+echo html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'sesskey', 'value' => sesskey()));
+echo html_writer::empty_tag('br');
+echo html_writer::empty_tag('input', array('id' => 'languninstallbutton',
+                                         'type' => 'submit',
+                                         'value' => get_string('uninstall', 'tool_langimport'))
+                            );
+echo html_writer::end_tag('fieldset');
+echo html_writer::end_tag('form');
+if ($remote) {
+    $url = new moodle_url('/admin/tool/langimport/index.php', array('mode' => UPDATE_ALL_LANG));
+    echo html_writer::start_tag('form', array('id' => 'updateform', 'action' => $url->out(), 'method' => 'post'));
+    echo html_writer::tag('fieldset', html_writer::empty_tag('input', array('type' => 'submit', 'value' => get_string('updatelangs','tool_langimport'))));
+    echo html_writer::end_tag('form');
+}
+echo html_writer::end_tag('td');
+
+// list of available languages
 $options = array();
 foreach ($availablelangs as $alang) {
     if (!empty($alang[0]) and trim($alang[0]) !== 'en' and !$controller->is_installed_lang($alang[0], $alang[1])) {
         $options[$alang[0]] = $alang[2].' &lrm;('.$alang[0].')&lrm;';
     }
 }
+if (!empty($options)) {
+    echo html_writer::start_tag('td', array('valign' => 'top'));
+    $url = new moodle_url('/admin/tool/langimport/index.php', array('mode' => INSTALLATION_OF_SELECTED_LANG));
+    echo html_writer::start_tag('form', array('id' => 'installform', 'action' => $url->out(), 'method' => 'post'));
+    echo html_writer::start_tag('fieldset');
+    echo html_writer::label(get_string('availablelangs','install'), 'menupack');
+    echo html_writer::empty_tag('br');
+    echo html_writer::select($options, 'pack[]', '', false, array('size' => 15, 'multiple' => 'multiple'));
+    echo html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'sesskey', 'value' => sesskey()));
+    echo html_writer::empty_tag('br');
+    echo html_writer::empty_tag('input', array('type' => 'submit', 'value' => get_string('install','tool_langimport')));
+    echo html_writer::end_tag('fieldset');
+    echo html_writer::end_tag('form');
+    echo html_writer::end_tag('td');
+}
 
-$renderable = new \tool_langimport\output\langimport_page($installedlangs, $options, $uninstallurl, $updateurl, $installurl);
-$output = $PAGE->get_renderer('tool_langimport');
-echo $output->render($renderable);
+echo html_writer::end_tag('tr');
+echo html_writer::end_tag('table');
+echo $OUTPUT->box_end();
 
+$uninstallurl = new moodle_url('/admin/tool/langimport/index.php');
 $PAGE->requires->strings_for_js(array('uninstallconfirm', 'uninstall', 'selectlangs', 'noenglishuninstall'),
                                 'tool_langimport');
 $PAGE->requires->yui_module('moodle-core-languninstallconfirm',
@@ -184,3 +219,4 @@ $PAGE->requires->yui_module('moodle-core-languninstallconfirm',
                              array(array('uninstallUrl' => $uninstallurl->out()))
                             );
 echo $OUTPUT->footer();
+die();

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

@@ -23,7 +23,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['downloadnotavailable'] = 'Unable to connect to the download server. It is not possible to install or update the language packs automatically. Please download the appropriate ZIP file(s) from <a href="{$a->src}">{$a->src}</a> and unzip them manually to your data directory <code>{$a->dest}</code>';
 $string['install'] = 'Install selected language pack(s)';
 $string['installedlangs'] = 'Installed language packs';
 $string['langimport'] = 'Language import utility';
@@ -44,6 +43,7 @@ $string['noenglishuninstall'] = 'The English language pack cannot be uninstalled
 $string['nolangupdateneeded'] = 'All your language packs are up to date, no update is needed';
 $string['pluginname'] = 'Language packs';
 $string['purgestringcaches'] = 'Purge string caches';
+$string['remotelangnotavailable'] = 'Because Moodle cannot connect to download.moodle.org, it is not possible for language packs to be installed automatically. Please download the appropriate ZIP file(s) from <a href="https://download.moodle.org/langpack/">download.moodle.org/langpack</a>, copy them to your {$a} directory and unzip them manually.';
 $string['selectlangs'] = 'Select languages to uninstall';
 $string['uninstall'] = 'Uninstall selected language pack(s)';
 $string['uninstallconfirm'] = 'You are about to completely uninstall these language packs: <strong>{$a}</strong>. Are you sure?';

admin/tool/langimport/styles.css

@@ -1,5 +1,9 @@
-#page-admin-tool-langimport-index .langimport {
+#page-admin-tool-langimport-index .generalbox table {
     margin: auto;
-    float: none;
     width: 100%;
 }
+
+#page-admin-tool-langimport-index .generalbox,
+#page-admin-tool-langimport-index .generalbox table {
+    text-align: center;
+}

admin/tool/langimport/templates/langimport.mustache

@@ -1,117 +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/>.
-}}
-{{!
-    @template tool_langimport/langimport
-
-    Template for the language import page.
-
-    Classes required for JS:
-    * none
-
-    Data attributes required for JS:
-    * none
-
-    Context variables required for this template:
-    * sesskey string The session key.
-    * uninstallurl string The URL for the uninstall action.
-    * updateurl string The URL for the update-language-packs action.
-    * installurl string The URL for the install action.
-    * installedoptions array The list of languages installed.
-    * toinstalloptions array The list of languages to be installed.
-    * caninstall boolean Flag to indicate if there are language packs that can be installed.
-
-    Example context (json):
-    {
-        "sesskey": "sesskey",
-        "uninstallurl": "#",
-        "updateurl": "#",
-        "installurl": "#",
-        "installedoptions": [
-            {
-                "value": "en",
-                "text": "English",
-                "selected": true
-            }
-        ],
-        "toinstalloptions": [
-            {
-                "value": "ja",
-                "text": "Japanese"
-            },
-            {
-                "value": "fr",
-                "text": "French"
-            },
-            {
-                "value": "es",
-                "text": "Spanish"
-            }
-        ],
-        "caninstall": true
-    }
-}}
-<div class="container-fluid langimport">
-    <div class="row row-fluid rtl-compatible">
-        <div class="col-md-{{#caninstall}}6{{/caninstall}}{{^caninstall}}12{{/caninstall}} span{{#caninstall}}6{{/caninstall}}{{^caninstall}}12{{/caninstall}} m-b-1">
-            <form id="uninstallform" action="{{uninstallurl}}" method="post">
-                <fieldset>
-                    <div class="form-group">
-                        <label for="menuuninstalllang">{{#str}}installedlangs, tool_langimport{{/str}}</label>
-                        <select size="15" multiple="multiple" id="menuuninstalllang" class="form-control input-block-level" name="uninstalllang[]">
-                            {{#installedoptions}}
-                                <option value="{{value}}" {{#selected}}selected="selected"{{/selected}}>{{{text}}}‎</option>
-                            {{/installedoptions}}
-                        </select>
-                    </div>
-                    <div class="form-group">
-                        <input type="hidden" name="sesskey" value="{{sesskey}}">
-                        <input id="languninstallbutton" type="submit" value="{{#str}}uninstall, tool_langimport{{/str}}" class="btn btn-default">
-                    </div>
-                </fieldset>
-            </form>
-            {{#updateurl}}
-                <div>
-                    <form id="updateform" action="{{updateurl}}" method="post">
-                        <fieldset>
-                            <input type="submit" value="{{#str}}updatelangs, tool_langimport{{/str}}" class="btn btn-default">
-                        </fieldset>
-                    </form>
-                </div>
-            {{/updateurl}}
-        </div>
-        {{#caninstall}}
-            <div class="col-md-6 span6 m-b-1">
-                <form id="installform" action="{{installurl}}" method="post">
-                    <fieldset>
-                        <div class="form-group">
-                            <label for="menupack">{{#str}}availablelangs, install{{/str}}</label>
-                            <select size="15" multiple="multiple" class="form-control input-block-level" id="menupack" name="pack[]">
-                                {{#toinstalloptions}}
-                                    <option value="{{value}}" {{#selected}}selected="selected"{{/selected}}>{{{text}}}‎</option>
-                                {{/toinstalloptions}}
-                            </select>
-                        </div>
-                        <div class="form-group">
-                            <input type="hidden" name="sesskey" value="{{sesskey}}">
-                            <input type="submit" value="{{#str}}install, tool_langimport{{/str}}" class="btn btn-default">
-                        </div>
-                    </fieldset>
-                </form>
-            </div>
-        {{/caninstall}}
-    </div>
-</div>

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

@@ -4,6 +4,7 @@ Feature: Manage language packs
   As an administrator
   I need to be able to add, update and remove language packs
 
+
   Background:
     Given remote langimport tests are enabled
 

admin/tool/log/classes/setting_managestores.php

@@ -169,14 +169,14 @@ class tool_log_setting_managestores extends admin_setting {
             if (isset($enabled[$store])) {
                 $aurl = new moodle_url($url, array('action' => 'disable', 'store' => $store));
                 $hideshow = "<a href=\"$aurl\">";
-                $hideshow .= $OUTPUT->pix_icon('t/hide', $strdisable) . '</a>';
+                $hideshow .= "<img src=\"" . $OUTPUT->pix_url('t/hide') . "\" class=\"iconsmall\" alt=\"$strdisable\" /></a>";
                 $isenabled = true;
                 $displayname = "<span>$name</span>";
             } else {
                 if (isset($available[$store])) {
                     $aurl = new moodle_url($url, array('action' => 'enable', 'store' => $store));
                     $hideshow = "<a href=\"$aurl\">";
-                    $hideshow .= $OUTPUT->pix_icon('t/show', $strenable) . '</a>';
+                    $hideshow .= "<img src=\"" . $OUTPUT->pix_url('t/show') . "\" class=\"iconsmall\" alt=\"$strenable\" /></a>";
                     $isenabled = false;
                     $displayname = "<span class=\"dimmed_text\">$name</span>";
                 } else {
@@ -188,7 +188,7 @@ class tool_log_setting_managestores extends admin_setting {
             if ($PAGE->theme->resolve_image_location('icon', $store, false)) {
                 $icon = $OUTPUT->pix_icon('icon', '', $store, array('class' => 'icon pluginicon'));
             } else {
-                $icon = $OUTPUT->spacer();
+                $icon = $OUTPUT->pix_icon('spacer', '', 'moodle', array('class' => 'icon pluginicon noicon'));
             }
 
             // Up/down link (only if store is enabled).
@@ -197,16 +197,16 @@ class tool_log_setting_managestores extends admin_setting {
                 if ($updowncount > 1) {
                     $aurl = new moodle_url($url, array('action' => 'up', 'store' => $store));
                     $updown .= "<a href=\"$aurl\">";
-                    $updown .= $OUTPUT->pix_icon('t/up', $strup) . '</a>&nbsp;';
+                    $updown .= "<img src=\"" . $OUTPUT->pix_url('t/up') . "\" alt=\"$strup\" class=\"iconsmall\" /></a>&nbsp;";
                 } else {
-                    $updown .= $OUTPUT->spacer();
+                    $updown .= "<img src=\"" . $OUTPUT->pix_url('spacer') . "\" class=\"iconsmall\" alt=\"\" />&nbsp;";
                 }
                 if ($updowncount < $storecount) {
                     $aurl = new moodle_url($url, array('action' => 'down', 'store' => $store));
                     $updown .= "<a href=\"$aurl\">";
-                    $updown .= $OUTPUT->pix_icon('t/down', $strdown) . '</a>&nbsp;';
+                    $updown .= "<img src=\"" . $OUTPUT->pix_url('t/down') . "\" alt=\"$strdown\" class=\"iconsmall\" /></a>";
                 } else {
-                    $updown .= $OUTPUT->spacer();
+                    $updown .= "<img src=\"" . $OUTPUT->pix_url('spacer') . "\" class=\"iconsmall\" alt=\"\" />";
                 }
                 ++$updowncount;
             }

admin/tool/lp/classes/course_competencies_form_element.php

@@ -65,7 +65,7 @@ class tool_lp_course_competencies_form_element extends MoodleQuickForm_autocompl
             $current = \core_competency\api::list_course_module_competencies_in_course_module($options['cmid']);
             $ids = array();
             foreach ($current as $coursemodulecompetency) {
-                array_push($ids, $coursemodulecompetency->get('competencyid'));
+                array_push($ids, $coursemodulecompetency->get_competencyid());
             }
             $this->setValue($ids);
         }
@@ -76,10 +76,10 @@ class tool_lp_course_competencies_form_element extends MoodleQuickForm_autocompl
         $context = context_course::instance($courseid);
         foreach ($competencies as $competency) {
             // We don't need to show the description as part of the options, so just set this to null.
-            $competency['competency']->set('description', null);
+            $competency['competency']->set_description(null);
             $exporter = new competency_exporter($competency['competency'], array('context' => $context));
             $templatecontext = array('competency' => $exporter->export($OUTPUT));
-            $id = $competency['competency']->get('id');
+            $id = $competency['competency']->get_id();
             $validoptions[$id] = $OUTPUT->render_from_template('tool_lp/competency_summary', $templatecontext);
         }
         $attributes['tags'] = false;

admin/tool/lp/classes/course_competency_rule_form_element.php

@@ -65,7 +65,7 @@ class tool_lp_course_competency_rule_form_element extends MoodleQuickForm_select
             // forcing them to be all the same for each activity.
             if (!empty($current)) {
                 $one = array_pop($current);
-                $this->setValue($one->get('ruleoutcome'));
+                $this->setValue($one->get_ruleoutcome());
             }
         }
         $validoptions = course_module_competency::get_ruleoutcome_list();

admin/tool/lp/classes/external.php

@@ -42,12 +42,12 @@ use external_multiple_structure;
 use invalid_parameter_exception;
 use required_capability_exception;
 
-use core_cohort\external\cohort_summary_exporter;
+use tool_lp\external\cohort_summary_exporter;
 use tool_lp\external\competency_path_exporter;
 use tool_lp\external\competency_summary_exporter;
 use tool_lp\external\course_competency_statistics_exporter;
-use core_course\external\course_module_summary_exporter;
-use core_course\external\course_summary_exporter;
+use tool_lp\external\course_module_summary_exporter;
+use tool_lp\external\course_summary_exporter;
 use tool_lp\external\template_statistics_exporter;
 use tool_lp\external\user_competency_summary_exporter;
 use tool_lp\external\user_competency_summary_in_course_exporter;
@@ -66,7 +66,7 @@ use core_competency\external\template_exporter;
 use core_competency\external\user_competency_course_exporter;
 use core_competency\external\user_competency_exporter;
 use core_competency\external\user_competency_plan_exporter;
-use core_user\external\user_summary_exporter;
+use core_competency\external\user_summary_exporter;
 
 /**
  * This is the external API for this tool.

admin/tool/lp/classes/external/cohort_summary_exporter.php

@@ -17,14 +17,15 @@
 /**
  * Class for exporting a cohort summary from an stdClass.
  *
- * @package    core_cohort
+ * @package    tool_lp
  * @copyright  2015 Damyon Wiese
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace core_cohort\external;
+namespace tool_lp\external;
 defined('MOODLE_INTERNAL') || die();
 
 use renderer_base;
+use moodle_url;
 
 /**
  * Class for exporting a cohort summary from an stdClass.
@@ -32,7 +33,7 @@ use renderer_base;
  * @copyright  2015 Damyon Wiese
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class cohort_summary_exporter extends \core\external\exporter {
+class cohort_summary_exporter extends \core_competency\external\exporter {
 
     protected static function define_related() {
         // Cohorts can exist on a category context.
@@ -61,8 +62,7 @@ class cohort_summary_exporter extends \core\external\exporter {
     public static function define_other_properties() {
         return array(
             'contextname' => array(
-                // The method context::get_context_name() already formats the string, and may return HTML.
-                'type' => PARAM_RAW
+                'type' => PARAM_TEXT
             ),
         );
     }

admin/tool/lp/classes/external/competency_path_exporter.php

@@ -33,7 +33,7 @@ use moodle_url;
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class competency_path_exporter extends \core\external\exporter {
+class competency_path_exporter extends \core_competency\external\exporter {
 
     /**
      * Constructor.
@@ -72,7 +72,7 @@ class competency_path_exporter extends \core\external\exporter {
                 'type' => path_node_exporter::read_properties_definition()
             ],
             'pluginbaseurl' => [
-                'type' => PARAM_URL
+                'type' => PARAM_TEXT
             ],
             'pagecontextid' => [
                 'type' => PARAM_INT
@@ -93,8 +93,8 @@ class competency_path_exporter extends \core\external\exporter {
         $i = 1;
         foreach ($this->related['ancestors'] as $competency) {
             $exporter = new path_node_exporter([
-                    'id' => $competency->get('id'),
-                    'name' => $competency->get('idnumber'),
+                    'id' => $competency->get_id(),
+                    'name' => $competency->get_idnumber(),
                     'position' => $i,
                     'first' => $i == 1,
                     'last' => $i == $nodescount
@@ -107,8 +107,8 @@ class competency_path_exporter extends \core\external\exporter {
         }
         $result->ancestors = $ancestors;
         $exporter = new path_node_exporter([
-                'id' => $this->related['framework']->get('id'),
-                'name' => $this->related['framework']->get('shortname'),
+                'id' => $this->related['framework']->get_id(),
+                'name' => $this->related['framework']->get_shortname(),
                 'first' => 0,
                 'last' => 0,
                 'position' => -1

admin/tool/lp/classes/external/competency_summary_exporter.php

@@ -30,7 +30,6 @@ use stdClass;
 use core_competency\competency_framework;
 use core_competency\external\competency_exporter;
 use core_competency\external\competency_framework_exporter;
-use core_course\external\course_summary_exporter;
 
 /**
  * Class for exporting competency data with additional related data.
@@ -38,7 +37,7 @@ use core_course\external\course_summary_exporter;
  * @copyright  2015 Damyon Wiese
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class competency_summary_exporter extends \core\external\exporter {
+class competency_summary_exporter extends \core_competency\external\exporter {
 
     protected static function define_related() {
         // We cache the context so it does not need to be retrieved from the framework every time.
@@ -116,11 +115,11 @@ class competency_summary_exporter extends \core\external\exporter {
 
         $exporter = new competency_framework_exporter($this->related['framework']);
         $result->framework = $exporter->export($output);
-        $scaleconfiguration = $this->related['framework']->get('scaleconfiguration');
-        $scaleid = $this->related['framework']->get('scaleid');
-        if ($competency->get('scaleid')) {
-            $scaleconfiguration = $competency->get('scaleconfiguration');
-            $scaleid = $competency->get('scaleid');
+        $scaleconfiguration = $this->related['framework']->get_scaleconfiguration();
+        $scaleid = $this->related['framework']->get_scaleid();
+        if ($competency->get_scaleid()) {
+            $scaleconfiguration = $competency->get_scaleconfiguration();
+            $scaleid = $competency->get_scaleid();
         }
         $result->scaleconfiguration = $scaleconfiguration;
         $result->scaleid = $scaleid;

admin/tool/lp/classes/external/course_competency_statistics_exporter.php

@@ -27,7 +27,6 @@ defined('MOODLE_INTERNAL') || die();
 use renderer_base;
 use moodle_url;
 use core_competency\external\competency_exporter;
-use core_competency\external\performance_helper;
 
 /**
  * Class for exporting a course competency statistics summary.
@@ -35,7 +34,7 @@ use core_competency\external\performance_helper;
  * @copyright  2015 Damyon Wiese
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class course_competency_statistics_exporter extends \core\external\exporter {
+class course_competency_statistics_exporter extends \core_competency\external\exporter {
 
     public static function define_properties() {
         return array(
@@ -85,9 +84,12 @@ class course_competency_statistics_exporter extends \core\external\exporter {
             $proficientcompetencypercentageformatted = format_float($proficientcompetencypercentage);
         }
         $competencies = array();
-        $helper = new performance_helper();
+        $contextcache = array();
         foreach ($this->data->leastproficientcompetencies as $competency) {
-            $context = $helper->get_context_from_competency($competency);
+            if (!isset($contextcache[$competency->get_competencyframeworkid()])) {
+                $contextcache[$competency->get_competencyframeworkid()] = $competency->get_context();
+            }
+            $context = $contextcache[$competency->get_competencyframeworkid()];
             $exporter = new competency_exporter($competency, array('context' => $context));
             $competencies[] = $exporter->export($output);
         }

admin/tool/lp/classes/external/course_module_summary_exporter.php

@@ -17,22 +17,23 @@
 /**
  * Class for exporting a course module summary from an stdClass.
  *
- * @package    core_course
+ * @package    tool_lp
  * @copyright  2015 Damyon Wiese
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace core_course\external;
+namespace tool_lp\external;
 defined('MOODLE_INTERNAL') || die();
 
 use renderer_base;
 
+
 /**
  * Class for exporting a course module summary from a cm_info class.
  *
  * @copyright  2015 Damyon Wiese
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class course_module_summary_exporter extends \core\external\exporter {
+class course_module_summary_exporter extends \core_competency\external\exporter {
 
     protected static function define_related() {
         return array('cm' => 'cm_info');

admin/tool/lp/classes/external/course_summary_exporter.php

@@ -17,11 +17,11 @@
 /**
  * Class for exporting a course summary from an stdClass.
  *
- * @package    core_course
+ * @package    tool_lp
  * @copyright  2015 Damyon Wiese
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace core_course\external;
+namespace tool_lp\external;
 defined('MOODLE_INTERNAL') || die();
 
 use renderer_base;
@@ -33,7 +33,7 @@ use moodle_url;
  * @copyright  2015 Damyon Wiese
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class course_summary_exporter extends \core\external\exporter {
+class course_summary_exporter extends \core_competency\external\exporter {
 
     protected static function define_related() {
         // We cache the context so it does not need to be retrieved from the course.
@@ -42,7 +42,6 @@ class course_summary_exporter extends \core\external\exporter {
 
     protected function get_other_values(renderer_base $output) {
         return array(
-            'fullnamedisplay' => get_course_display_name_for_list($this->data),
             'viewurl' => (new moodle_url('/course/view.php', array('id' => $this->data->id)))->out(false)
         );
     }
@@ -60,25 +59,12 @@ class course_summary_exporter extends \core\external\exporter {
             ),
             'idnumber' => array(
                 'type' => PARAM_RAW,
-            ),
-            'summary' => array(
-                'type' => PARAM_RAW,
-                'null' => NULL_ALLOWED
-            ),
-            'startdate' => array(
-                'type' => PARAM_INT,
-            ),
-            'enddate' => array(
-                'type' => PARAM_INT,
             )
         );
     }
 
     public static function define_other_properties() {
         return array(
-            'fullnamedisplay' => array(
-                'type' => PARAM_TEXT,
-            ),
             'viewurl' => array(
                 'type' => PARAM_URL,
             )

admin/tool/lp/classes/external/path_node_exporter.php

@@ -24,7 +24,6 @@
 namespace tool_lp\external;
 defined('MOODLE_INTERNAL') || die();
 
-use context_system;
 
 /**
  * Class for exporting path_node data.
@@ -32,35 +31,7 @@ use context_system;
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class path_node_exporter extends \core\external\exporter {
-
-    /**
-     * Constructor - saves the persistent object, and the related objects.
-     *
-     * @param mixed $data The data.
-     * @param array $related Array of relateds.
-     */
-    public function __construct($data, $related = array()) {
-        if (!isset($related['context'])) {
-            // Previous code was automatically using the system context which was not always correct.
-            // We let developers know that they must fix their code without breaking anything,
-            // and fallback on the previous behaviour. This should be removed at a later stage: Moodle 3.5.
-            debugging('Missing related context in path_node_exporter.', DEBUG_DEVELOPER);
-            $related['context'] = context_system::instance();
-        }
-        parent::__construct($data, $related);
-    }
-
-    /**
-     * Return the list of properties.
-     *
-     * @return array
-     */
-    protected static function define_related() {
-        return [
-            'context' => 'context'
-        ];
-    }
+class path_node_exporter extends \core_competency\external\exporter {
 
     /**
      * Return the list of properties.

admin/tool/lp/classes/external/template_statistics_exporter.php

@@ -27,7 +27,6 @@ defined('MOODLE_INTERNAL') || die();
 use renderer_base;
 use moodle_url;
 use core_competency\external\competency_exporter;
-use core_competency\external\performance_helper;
 
 /**
  * Class for exporting a cohort summary from an stdClass.
@@ -35,7 +34,7 @@ use core_competency\external\performance_helper;
  * @copyright  2015 Damyon Wiese
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class template_statistics_exporter extends \core\external\exporter {
+class template_statistics_exporter extends \core_competency\external\exporter {
 
     public static function define_properties() {
         return array(
@@ -119,9 +118,12 @@ class template_statistics_exporter extends \core\external\exporter {
             $proficientusercompetencyplanpercentageformatted = format_float($proficientusercompetencyplanpercentage);
         }
         $competencies = array();
-        $helper = new performance_helper();
+        $contextcache = array();
         foreach ($this->data->leastproficientcompetencies as $competency) {
-            $context = $helper->get_context_from_competency($competency);
+            if (!isset($contextcache[$competency->get_competencyframeworkid()])) {
+                $contextcache[$competency->get_competencyframeworkid()] = $competency->get_context();
+            }
+            $context = $contextcache[$competency->get_competencyframeworkid()];
             $exporter = new competency_exporter($competency, array('context' => $context));
             $competencies[] = $exporter->export($output);
         }

admin/tool/lp/classes/external/user_competency_summary_exporter.php

@@ -22,17 +22,16 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 namespace tool_lp\external;
-defined('MOODLE_INTERNAL') || die();
 
 use context_user;
 use renderer_base;
 use stdClass;
-use core_comment\external\comment_area_exporter;
+use core_competency\external\comment_area_exporter;
 use core_competency\external\evidence_exporter;
 use core_competency\external\user_competency_exporter;
 use core_competency\external\user_competency_plan_exporter;
 use core_competency\external\user_competency_course_exporter;
-use core_user\external\user_summary_exporter;
+use core_competency\external\user_summary_exporter;
 use core_competency\user_competency;
 
 /**
@@ -41,7 +40,7 @@ use core_competency\user_competency;
  * @copyright  2015 Damyon Wiese
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class user_competency_summary_exporter extends \core\external\exporter {
+class user_competency_summary_exporter extends \core_competency\external\exporter {
 
     protected static function define_related() {
         // We cache the context so it does not need to be retrieved from the framework every time.
@@ -133,9 +132,9 @@ class user_competency_summary_exporter extends \core\external\exporter {
         $result->evidence = array();
         if (count($this->related['evidence'])) {
             foreach ($this->related['evidence'] as $evidence) {
-                $actionuserid = $evidence->get('actionuserid');
+                $actionuserid = $evidence->get_actionuserid();
                 if (!empty($actionuserid)) {
-                    $usercache[$evidence->get('actionuserid')] = true;
+                    $usercache[$evidence->get_actionuserid()] = true;
                 }
             }
             $users = array();
@@ -149,12 +148,11 @@ class user_competency_summary_exporter extends \core\external\exporter {
             }
 
             foreach ($this->related['evidence'] as $evidence) {
-                $actionuserid = $evidence->get('actionuserid');
+                $actionuserid = $evidence->get_actionuserid();
                 $related = array(
                     'scale' => $scale,
                     'usercompetency' => ($this->related['usercompetency'] ? $this->related['usercompetency'] : null),
                     'usercompetencyplan' => ($this->related['usercompetencyplan'] ? $this->related['usercompetencyplan'] : null),
-                    'context' => $evidence->get_context()
                 );
                 $related['actionuser'] = !empty($actionuserid) ? $usercache[$actionuserid] : null;
                 $exporter = new evidence_exporter($evidence, $related);

admin/tool/lp/classes/external/user_competency_summary_in_course_exporter.php

@@ -22,12 +22,9 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 namespace tool_lp\external;
-defined('MOODLE_INTERNAL') || die();
 
 use core_competency\api;
 use core_competency\user_competency;
-use core_course\external\course_module_summary_exporter;
-use core_course\external\course_summary_exporter;
 use context_course;
 use renderer_base;
 use stdClass;
@@ -38,7 +35,7 @@ use stdClass;
  * @copyright  2015 Damyon Wiese
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class user_competency_summary_in_course_exporter extends \core\external\exporter {
+class user_competency_summary_in_course_exporter extends \core_competency\external\exporter {
 
     protected static function define_related() {
         // We cache the context so it does not need to be retrieved from the framework every time.
@@ -83,7 +80,7 @@ class user_competency_summary_in_course_exporter extends \core\external\exporter
         $exporter = new course_summary_exporter($this->related['course'], array('context' => $context));
         $result->course = $exporter->export($output);
 
-        $coursemodules = api::list_course_modules_using_competency($this->related['competency']->get('id'),
+        $coursemodules = api::list_course_modules_using_competency($this->related['competency']->get_id(),
                                                                    $this->related['course']->id);
 
         $fastmodinfo = get_fast_modinfo($this->related['course']->id);

admin/tool/lp/classes/external/user_competency_summary_in_plan_exporter.php

@@ -22,7 +22,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 namespace tool_lp\external;
-defined('MOODLE_INTERNAL') || die();
 
 use context_user;
 use renderer_base;
@@ -35,7 +34,7 @@ use core_competency\external\plan_exporter;
  * @copyright  2015 Damyon Wiese
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class user_competency_summary_in_plan_exporter extends \core\external\exporter {
+class user_competency_summary_in_plan_exporter extends \core_competency\external\exporter {
 
     protected static function define_related() {
         // We cache the context so it does not need to be retrieved from the framework every time.

admin/tool/lp/classes/external/user_evidence_competency_summary_exporter.php

@@ -22,7 +22,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 namespace tool_lp\external;
-defined('MOODLE_INTERNAL') || die();
 
 use moodle_url;
 use renderer_base;
@@ -35,7 +34,7 @@ use core_competency\external\user_competency_exporter;
  * @copyright  2016 Serge Gauthier - <serge.gauthier.2@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class user_evidence_competency_summary_exporter extends \core\external\exporter {
+class user_evidence_competency_summary_exporter extends \core_competency\external\exporter {
 
     protected static function define_related() {
         return array('competency' => '\\core_competency\\competency',

admin/tool/lp/classes/external/user_evidence_summary_exporter.php

@@ -26,8 +26,7 @@ defined('MOODLE_INTERNAL') || die();
 
 use moodle_url;
 use renderer_base;
-use core_files\external\stored_file_exporter;
-use core_competency\external\performance_helper;
+use core_competency\external\stored_file_exporter;
 
 /**
  * Class for exporting user evidence with all competencies.
@@ -35,10 +34,10 @@ use core_competency\external\performance_helper;
  * @copyright  2016 Serge Gauthier - <serge.gauthier.2@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class user_evidence_summary_exporter extends \core\external\persistent_exporter {
+class user_evidence_summary_exporter extends \core_competency\external\persistent_exporter {
 
     protected static function define_class() {
-        return \core_competency\user_evidence::class;
+        return 'core_competency\\user_evidence';
     }
 
     protected static function define_other_properties() {
@@ -75,7 +74,7 @@ class user_evidence_summary_exporter extends \core\external\persistent_exporter
 
     protected function get_other_values(renderer_base $output) {
         $urlshort = '';
-        $url = $this->persistent->get('url');
+        $url = $this->persistent->get_url();
         if (!empty($url)) {
             $murl = new moodle_url($url);
             $shorturl = preg_replace('@^https?://(www\.)?@', '', $murl->out(false));
@@ -92,19 +91,32 @@ class user_evidence_summary_exporter extends \core\external\persistent_exporter
         }
 
         $userevidencecompetencies = array();
+        $frameworks = array();
+        $scales = array();
         $usercompetencies = $this->persistent->get_user_competencies();
-        $helper = new performance_helper();
         foreach ($usercompetencies as $usercompetency) {
             $competency = $usercompetency->get_competency();
 
-            $context = $helper->get_context_from_competency($competency);
-            $framework = $helper->get_framework_from_competency($competency);
-            $scale = $helper->get_scale_from_competency($competency);
+            // Get the framework.
+            if (!isset($frameworks[$competency->get_competencyframeworkid()])) {
+                $frameworks[$competency->get_competencyframeworkid()] = $competency->get_framework();
+            }
+            $framework = $frameworks[$competency->get_competencyframeworkid()];
+
+            // Get the scale.
+            $scaleid = $competency->get_scaleid();
+            if ($scaleid === null) {
+                $scaleid = $framework->get_scaleid();
+            }
+            if (!isset($scales[$framework->get_scaleid()])) {
+                $scales[$framework->get_scaleid()] = $framework->get_scale();
+            }
+            $scale = $scales[$framework->get_scaleid()];
 
             $related = array('competency' => $competency,
                              'usercompetency' => $usercompetency,
                              'scale' => $scale,
-                             'context' => $context);
+                             'context' => $framework->get_context());
 
             $userevidencecompetencysummaryexporter = new user_evidence_competency_summary_exporter(null, $related);
 

admin/tool/lp/classes/form/competency.php

@@ -26,7 +26,6 @@ namespace tool_lp\form;
 defined('MOODLE_INTERNAL') || die();
 
 use stdClass;
-use core\form\persistent;
 
 /**
  * Competency framework form.
@@ -54,29 +53,26 @@ class competency extends persistent {
 
         $mform->addElement('hidden', 'competencyframeworkid');
         $mform->setType('competencyframeworkid', PARAM_INT);
-        $mform->setConstant('competencyframeworkid', $framework->get('id'));
+        $mform->setConstant('competencyframeworkid', $framework->get_id());
 
         $mform->addElement('header', 'generalhdr', get_string('general'));
 
         $mform->addElement('static',
                            'frameworkdesc',
                            get_string('competencyframework', 'tool_lp'),
-                           s($framework->get('shortname')));
+                           s($framework->get_shortname()));
 
         $mform->addElement('hidden', 'parentid', '', array('id' => 'tool_lp_parentcompetency'));
 
         $mform->setType('parentid', PARAM_INT);
-        $mform->setConstant('parentid', ($parent) ? $parent->get('id') : 0);
+        $mform->setConstant('parentid', ($parent) ? $parent->get_id() : 0);
         $parentlevel = ($parent) ? $parent->get_level() : 0;
-        $parentname = ($parent) ? $parent->get('shortname') : get_string('competencyframeworkroot', 'tool_lp');
-        $parentlabel = '';
-        if (!empty($competency->get('id'))) {
-            $parentlabel = get_string('taxonomy_parent_' . $framework->get_taxonomy($parentlevel), 'tool_lp');
-        } else {
-            $parentlabel = get_string('parentcompetency', 'tool_lp');
-        }
+        $parentname = ($parent) ? $parent->get_shortname() : get_string('competencyframeworkroot', 'tool_lp');
+        $parentlabel = ($competency->get_id()) ?
+            get_string('taxonomy_parent_' . $framework->get_taxonomy($parentlevel), 'tool_lp') :
+            get_string('parentcompetency', 'tool_lp');
         $editaction = '';
-        if (!$competency->get('id')) {
+        if (!$competency->get_id()) {
             $icon = $OUTPUT->pix_icon('t/editinline', get_string('parentcompetency_edit', 'tool_lp'));
             $editaction = $OUTPUT->action_link('#', $icon, null, array('id' => 'id_parentcompetencybutton'));
         }
@@ -86,12 +82,12 @@ class competency extends persistent {
                            $parentlabel,
                            "<span id='id_parentdesc'>$parentname</span>&nbsp;".$editaction);
         // Set the picker competency when adding new competency.
-        if (!$competency->get('id')) {
+        if (!$competency->get_id()) {
             // Call the parentcompetency_form init to initialize the competency picker for parent competency.
             $PAGE->requires->js_call_amd('tool_lp/parentcompetency_form', 'init', array('#id_parentcompetencybutton',
                 '#tool_lp_parentcompetency',
                 '#id_parentdesc',
-                $framework->get('id'),
+                $framework->get_id(),
                 $pagecontextid));
         }
 
@@ -103,7 +99,7 @@ class competency extends persistent {
         // Description.
         $mform->addElement('editor', 'description',
                            get_string('description', 'tool_lp'), array('rows' => 4));
-        $mform->setType('description', PARAM_CLEANHTML);
+        $mform->setType('description', PARAM_RAW);
         // ID number.
         $mform->addElement('text', 'idnumber', get_string('idnumber', 'tool_lp'), 'maxlength="100"');
         $mform->setType('idnumber', PARAM_RAW);
@@ -127,7 +123,7 @@ class competency extends persistent {
             // configuration requires this field so we only disable it. It is fine as setting the value
             // as a constant will ensure that nobody can change it. And it's validated in the persistent anyway.
             $scaleid->updateAttributes(array('disabled' => 'disabled'));
-            $mform->setConstant('scaleid', $competency->get('scaleid'));
+            $mform->setConstant('scaleid', $competency->get_scaleid());
         }
 
         // Disable short forms.

admin/tool/lp/classes/form/competency_framework.php

@@ -26,7 +26,6 @@ namespace tool_lp\form;
 defined('MOODLE_INTERNAL') || die();
 
 use stdClass;
-use core\form\persistent;
 
 /**
  * Competency framework form.
@@ -63,7 +62,7 @@ class competency_framework extends persistent {
         // Description.
         $mform->addElement('editor', 'description',
                            get_string('description', 'tool_lp'), array('rows' => 4));
-        $mform->setType('description', PARAM_CLEANHTML);
+        $mform->setType('description', PARAM_RAW);
         // ID number.
         $mform->addElement('text', 'idnumber', get_string('idnumber', 'tool_lp'), 'maxlength="100"');
         $mform->setType('idnumber', PARAM_RAW);
@@ -80,7 +79,7 @@ class competency_framework extends persistent {
             // configuration requires this field so we only disable it. It is fine as setting the value
             // as a constant will ensure that nobody can change it. And it's validated in the persistent anyway.
             $scaleid->updateAttributes(array('readonly' => 'readonly'));
-            $mform->setConstant('scaleid', $framework->get('scaleid'));
+            $mform->setConstant('scaleid', $framework->get_scaleid());
         }
 
         $mform->addElement('button', 'scaleconfigbutton', get_string('configurescale', 'tool_lp'));
@@ -149,7 +148,7 @@ class competency_framework extends persistent {
      */
     protected function get_default_data() {
         $data = parent::get_default_data();
-        $data->taxonomies = $this->get_persistent()->get('taxonomies');
+        $data->taxonomies = $this->get_persistent()->get_taxonomies();
         return $data;
     }
 

admin/tool/lp/classes/form/framework_autocomplete.php

@@ -109,11 +109,11 @@ class framework_autocomplete extends MoodleQuickForm_autocomplete {
             if (!has_any_capability(array('moodle/competency:competencyview', 'moodle/competency:competencymanage'),
                     $framework->get_context())) {
                 continue;
-            } else if ($this->onlyvisible && !$framework->get('visible')) {
+            } else if ($this->onlyvisible && !$framework->get_visible()) {
                 continue;
             }
-            $this->addOption($framework->get('shortname') . ' ' . $framework->get('idnumber'), $framework->get('id'));
-            array_push($toselect, $framework->get('id'));
+            $this->addOption($framework->get_shortname() . ' ' . $framework->get_idnumber(), $framework->get_id());
+            array_push($toselect, $framework->get_id());
         }
 
         return $this->setSelected($toselect);

admin/tool/lp/classes/form/persistent.php

@@ -17,12 +17,12 @@
 /**
  * Persistent form abstract.
  *
- * @package    core
+ * @package    tool_lp
  * @copyright  2015 Frédéric Massart - FMCorz.net
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace core\form;
+namespace tool_lp\form;
 defined('MOODLE_INTERNAL') || die();
 
 use coding_exception;
@@ -47,7 +47,7 @@ require_once($CFG->libdir.'/formslib.php');
  * You may exclude some fields from the validation should your form include other
  * properties such as files. To do so use the $foreignfields property.
  *
- * @package    core
+ * @package    tool_lp
  * @copyright  2015 Frédéric Massart - FMCorz.net
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -62,7 +62,7 @@ abstract class persistent extends moodleform {
     /** @var array Fields to remove from the persistent validation. */
     protected static $foreignfields = array();
 
-    /** @var \core\peristent Reference to the persistent. */
+    /** @var \tool_lp\peristent Reference to the persistent. */
     private $persistent = null;
 
     /**
@@ -85,7 +85,7 @@ abstract class persistent extends moodleform {
                                 $attributes = null, $editable = true) {
         if (empty(static::$persistentclass)) {
             throw new coding_exception('Static property $persistentclass must be set.');
-        } else if (!is_subclass_of(static::$persistentclass, 'core\\persistent')) {
+        } else if (!is_subclass_of(static::$persistentclass, 'core_competency\\persistent')) {
             throw new coding_exception('Static property $persistentclass is not valid.');
         } else if (!array_key_exists('persistent', $customdata)) {
             throw new coding_exception('The custom data \'persistent\' key must be set, even if it is null.');
@@ -134,45 +134,6 @@ abstract class persistent extends moodleform {
         return $data;
     }
 
-    /**
-     * After definition hook.
-     *
-     * Automatically try to set the types of simple fields using the persistent properties definition.
-     * This only applies to hidden, text and url types. Groups are also ignored as they are most likely custom.
-     *
-     * @return void
-     */
-    protected function after_definition() {
-        parent::after_definition();
-        $mform = $this->_form;
-
-        $class = static::$persistentclass;
-        $properties = $class::properties_definition();
-
-        foreach ($mform->_elements as $element) {
-            $name = $element->getName();
-
-            if (isset($mform->_types[$name])) {
-                // We already have a PARAM_* type for this field.
-                continue;
-
-            } else if (!isset($properties[$name]) || in_array($name, static::$fieldstoremove)
-                    || in_array($name, static::$foreignfields)) {
-                // Ignoring foreign and unknown fields.
-                continue;
-            }
-
-            // Set the type on the element.
-            switch ($element->getType()) {
-                case 'hidden':
-                case 'text':
-                case 'url':
-                    $mform->setType($name, $properties[$name]['type']);
-                    break;
-            }
-        }
-    }
-
     /**
      * Define extra validation mechanims.
      *
@@ -223,14 +184,9 @@ abstract class persistent extends moodleform {
         $data = $this->get_persistent()->to_record();
         $class = static::$persistentclass;
         $properties = $class::get_formatted_properties();
-        $allproperties = $class::properties_definition();
 
         foreach ($data as $field => $value) {
-            // Clean data if it is to be displayed in a form.
-            if (isset($allproperties[$field]['type'])) {
-                $data->$field = clean_param($data->$field, $allproperties[$field]['type']);
-            }
-
+            // Convert formatted properties.
             if (isset($properties[$field])) {
                 $data->$field = array(
                     'text' => $data->$field,
@@ -259,7 +215,7 @@ abstract class persistent extends moodleform {
             $data = static::convert_fields($data);
 
             // Ensure that the ID is set.
-            $data->id = $this->persistent->get('id');
+            $data->id = $this->persistent->get_id();
         }
         return $data;
     }
@@ -267,7 +223,7 @@ abstract class persistent extends moodleform {
     /**
      * Return the persistent object associated with this form instance.
      *
-     * @return core\persistent
+     * @return tool_lp\persistent
      */
     final protected function get_persistent() {
         return $this->persistent;

admin/tool/lp/classes/form/plan.php

@@ -25,7 +25,6 @@
 namespace tool_lp\form;
 defined('MOODLE_INTERNAL') || die();
 
-use core\form\persistent;
 use core_competency\plan as planpersistent;
 use required_capability_exception;
 
@@ -60,7 +59,7 @@ class plan extends persistent {
         $mform->addRule('name', get_string('maximumchars', '', 100), 'maxlength', 100, 'client');
         // Description.
         $mform->addElement('editor', 'description', get_string('plandescription', 'tool_lp'), array('rows' => 4));
-        $mform->setType('description', PARAM_CLEANHTML);
+        $mform->setType('description', PARAM_RAW);
 
         $mform->addElement('date_time_selector', 'duedate', get_string('duedate', 'tool_lp'), array('optional' => true));
         $mform->addHelpButton('duedate', 'duedate', 'tool_lp');
@@ -69,7 +68,7 @@ class plan extends persistent {
         // When the plan was already saved then the status can not be changed via this form.
         $status = planpersistent::get_status_list($this->_customdata['userid']);
         $plan = $this->get_persistent();
-        if ($plan->get('id')) {
+        if ($plan->get_id()) {
             // The current status is not selectable (workflow status probably), we just display it.
             $mform->addElement('static', 'staticstatus', get_string('status', 'tool_lp'), $plan->get_statusname());
         } else if (!empty($status) && count($status) > 1) {

admin/tool/lp/classes/form/template.php

@@ -25,8 +25,6 @@
 namespace tool_lp\form;
 defined('MOODLE_INTERNAL') || die();
 
-use core\form\persistent;
-
 /**
  * Learning plan template form.
  *
@@ -60,7 +58,7 @@ class template extends persistent {
         // Description.
         $mform->addElement('editor', 'description',
                            get_string('description', 'tool_lp'), array('rows' => 4));
-        $mform->setType('description', PARAM_CLEANHTML);
+        $mform->setType('description', PARAM_RAW);
         $mform->addElement('selectyesno', 'visible',
                            get_string('visible', 'tool_lp'));
         $mform->addElement('date_time_selector',

admin/tool/lp/classes/form/template_cohorts.php

@@ -26,7 +26,6 @@ namespace tool_lp\form;
 defined('MOODLE_INTERNAL') || die();
 
 use moodleform;
-use core\form\persistent;
 
 require_once($CFG->libdir . '/formslib.php');
 

admin/tool/lp/classes/form/template_plans.php

@@ -26,7 +26,6 @@ namespace tool_lp\form;
 defined('MOODLE_INTERNAL') || die();
 
 use moodleform;
-use core\form\persistent;
 
 require_once($CFG->libdir . '/formslib.php');
 

admin/tool/lp/classes/form/user_evidence.php

@@ -25,8 +25,6 @@
 namespace tool_lp\form;
 defined('MOODLE_INTERNAL') || die();
 
-use core\form\persistent;
-
 /**
  * User evidence form class.
  *
@@ -56,7 +54,7 @@ class user_evidence extends persistent {
         $mform->addRule('name', get_string('maximumchars', '', 100), 'maxlength', 100, 'client');
         // Description.
         $mform->addElement('editor', 'description', get_string('userevidencedescription', 'tool_lp'), array('rows' => 10));
-        $mform->setType('description', PARAM_CLEANHTML);
+        $mform->setType('description', PARAM_RAW);
 
         $mform->addElement('url', 'url', get_string('userevidenceurl', 'tool_lp'), array('size' => '60'), array('usefilepicker' => false));
         $mform->setType('url', PARAM_RAW_TRIMMED);      // Can not use PARAM_URL, it silently converts bad URLs to ''.

admin/tool/lp/classes/output/competency_plan_navigation.php

@@ -27,8 +27,7 @@ use renderable;
 use renderer_base;
 use templatable;
 use context_course;
-use core_competency\external\competency_exporter;
-use core_competency\external\performance_helper;
+use \core_competency\external\competency_exporter;
 use stdClass;
 
 /**
@@ -83,9 +82,13 @@ class competency_plan_navigation implements renderable, templatable {
 
         $plancompetencies = \core_competency\api::list_plan_competencies($data->planid);
         $data->competencies = array();
-        $helper = new performance_helper();
+        $contextcache = array();
         foreach ($plancompetencies as $plancompetency) {
-            $context = $helper->get_context_from_competency($plancompetency->competency);
+            $frameworkid = $plancompetency->competency->get_competencyframeworkid();
+            if (!isset($contextcache[$frameworkid])) {
+                $contextcache[$frameworkid] = $plancompetency->competency->get_context();
+            }
+            $context = $contextcache[$frameworkid];
             $exporter = new competency_exporter($plancompetency->competency, array('context' => $context));
             $competency = $exporter->export($output);
             if ($competency->id == $this->competencyid) {

admin/tool/lp/classes/output/competency_summary.php

@@ -63,11 +63,11 @@ class competency_summary implements renderable, templatable {
         $this->competency = $competency;
         $this->framework = $framework;
         if ($includerelated) {
-            $this->relatedcompetencies = api::list_related_competencies($competency->get('id'));
+            $this->relatedcompetencies = api::list_related_competencies($competency->get_id());
         }
 
         if ($includecourses) {
-            $this->courses = api::list_courses_using_competency($competency->get('id'));
+            $this->courses = api::list_courses_using_competency($competency->get_id());
         }
     }
 

admin/tool/lp/classes/output/course_competencies_page.php

@@ -35,7 +35,6 @@ use core_competency\api;
 use tool_lp\course_competency_statistics;
 use core_competency\competency;
 use core_competency\course_competency;
-use core_competency\external\performance_helper;
 use core_competency\external\competency_exporter;
 use core_competency\external\course_competency_exporter;
 use core_competency\external\course_competency_settings_exporter;
@@ -43,7 +42,7 @@ use core_competency\external\user_competency_course_exporter;
 use core_competency\external\user_competency_exporter;
 use tool_lp\external\competency_path_exporter;
 use tool_lp\external\course_competency_statistics_exporter;
-use core_course\external\course_module_summary_exporter;
+use tool_lp\external\course_module_summary_exporter;
 
 /**
  * Class containing data for course competencies page
@@ -113,6 +112,7 @@ class course_competencies_page implements renderable, templatable {
         $data->courseid = $this->courseid;
         $data->pagecontextid = $this->context->id;
         $data->competencies = array();
+        $contextcache = array();
 
         $gradable = is_enrolled($this->context, $USER, 'moodle/competency:coursecompetencygradable');
         if ($gradable) {
@@ -126,19 +126,21 @@ class course_competencies_page implements renderable, templatable {
             $ruleoutcomeoptions[$value] = array('value' => $value, 'text' => (string) $text, 'selected' => false);
         }
 
-        $helper = new performance_helper();
         foreach ($this->coursecompetencylist as $coursecompetencyelement) {
             $coursecompetency = $coursecompetencyelement['coursecompetency'];
             $competency = $coursecompetencyelement['competency'];
-            $context = $helper->get_context_from_competency($competency);
+            if (!isset($contextcache[$competency->get_competencyframeworkid()])) {
+                $contextcache[$competency->get_competencyframeworkid()] = $competency->get_context();
+            }
+            $context = $contextcache[$competency->get_competencyframeworkid()];
 
             $compexporter = new competency_exporter($competency, array('context' => $context));
             $ccexporter = new course_competency_exporter($coursecompetency, array('context' => $context));
 
             $ccoutcomeoptions = (array) (object) $ruleoutcomeoptions;
-            $ccoutcomeoptions[$coursecompetency->get('ruleoutcome')]['selected'] = true;
+            $ccoutcomeoptions[$coursecompetency->get_ruleoutcome()]['selected'] = true;
 
-            $coursemodules = api::list_course_modules_using_competency($competency->get('id'), $this->courseid);
+            $coursemodules = api::list_course_modules_using_competency($competency->get_id(), $this->courseid);
 
             $fastmodinfo = get_fast_modinfo($this->courseid);
             $exportedmodules = array();
@@ -150,7 +152,7 @@ class course_competencies_page implements renderable, templatable {
             // Competency path.
             $pathexporter = new competency_path_exporter([
                 'ancestors' => $competency->get_ancestors(),
-                'framework' => $helper->get_framework_from_competency($competency),
+                'framework' => $competency->get_framework(),
                 'context' => $context
             ]);
 
@@ -164,13 +166,13 @@ class course_competencies_page implements renderable, templatable {
             if ($gradable) {
                 $foundusercompetencycourse = false;
                 foreach ($usercompetencycourses as $usercompetencycourse) {
-                    if ($usercompetencycourse->get('competencyid') == $competency->get('id')) {
+                    if ($usercompetencycourse->get_competencyid() == $competency->get_id()) {
                         $foundusercompetencycourse = $usercompetencycourse;
                     }
                 }
                 if ($foundusercompetencycourse) {
                     $related = array(
-                        'scale' => $helper->get_scale_from_competency($competency)
+                        'scale' => $competency->get_scale()
                     );
                     $exporter = new user_competency_course_exporter($foundusercompetencycourse, $related);
                     $onerow['usercompetencycourse'] = $exporter->export($output);

admin/tool/lp/classes/output/plan_page.php

@@ -29,7 +29,6 @@ use templatable;
 use stdClass;
 use moodle_url;
 use core_competency\api;
-use core_competency\external\performance_helper;
 use core_competency\plan;
 use core_competency\external\competency_exporter;
 use core_competency\external\plan_exporter;
@@ -63,6 +62,9 @@ class plan_page implements renderable, templatable {
      * @return stdClass
      */
     public function export_for_template(\renderer_base $output) {
+        $frameworks = array();
+        $scales = array();
+
         $planexporter = new plan_exporter($this->plan, array('template' => $this->plan->get_template()));
 
         $data = new stdClass();
@@ -79,27 +81,40 @@ class plan_page implements renderable, templatable {
             $ucexporter = 'core_competency\\external\\user_competency_exporter';
         }
 
-        $helper = new performance_helper();
         $pclist = api::list_plan_competencies($this->plan);
         $proficientcount = 0;
         foreach ($pclist as $pc) {
             $comp = $pc->competency;
             $usercomp = $pc->$ucproperty;
 
-            $compcontext = $helper->get_context_from_competency($comp);
-            $framework = $helper->get_framework_from_competency($comp);
-            $scale = $helper->get_scale_from_competency($comp);
+            // Get the framework.
+            if (!isset($frameworks[$comp->get_competencyframeworkid()])) {
+                $frameworks[$comp->get_competencyframeworkid()] = $comp->get_framework();
+            }
+            $framework = $frameworks[$comp->get_competencyframeworkid()];
+
+            // Get the scale.
+            $scaleid = $comp->get_scaleid();
+            $compscale = $comp->get_scale();
+            if ($scaleid === null) {
+                $scaleid = $framework->get_scaleid();
+                $compscale = $framework->get_scale();
+            }
+            if (!isset($scales[$scaleid])) {
+                $scales[$scaleid] = $compscale;
+            }
+            $scale = $scales[$scaleid];
 
             // Prepare the data.
             $record = new stdClass();
-            $exporter = new competency_exporter($comp, array('context' => $compcontext));
+            $exporter = new competency_exporter($comp, array('context' => $framework->get_context()));
             $record->competency = $exporter->export($output);
 
             // Competency path.
             $exporter = new competency_path_exporter([
                 'ancestors' => $comp->get_ancestors(),
                 'framework' => $framework,
-                'context' => $compcontext
+                'context' => $framework->get_context()
             ]);
             $record->comppath = $exporter->export($output);
 
@@ -107,7 +122,7 @@ class plan_page implements renderable, templatable {
             $record->$ucproperty = $exporter->export($output);
 
             $data->competencies[] = $record;
-            if ($usercomp->get('proficiency')) {
+            if ($usercomp->get_proficiency()) {
                 $proficientcount++;
             }
         }

admin/tool/lp/classes/output/template_cohorts_table.php

@@ -142,7 +142,7 @@ class template_cohorts_table extends table_sql {
                   FROM {" . \core_competency\template_cohort::TABLE . "} tc
                   JOIN {cohort} c ON c.id = tc.cohortid
                  WHERE tc.templateid = :templateid";
-        $params = array('templateid' => $this->template->get('id'));
+        $params = array('templateid' => $this->template->get_id());
 
         // Add order by if needed.
         if (!$count && $sqlsort = $this->get_sql_sort()) {

admin/tool/lp/classes/output/template_competencies_page.php

@@ -34,7 +34,6 @@ use moodle_url;
 use core_competency\external\template_exporter;
 use core_competency\template;
 use core_competency\api;
-use core_competency\external\performance_helper;
 use tool_lp\external\competency_summary_exporter;
 use tool_lp\external\template_statistics_exporter;
 use tool_lp\template_statistics;
@@ -77,7 +76,7 @@ class template_competencies_page implements renderable, templatable {
     public function __construct(template $template, context $pagecontext) {
         $this->pagecontext = $pagecontext;
         $this->template = $template;
-        $this->templatestatistics = new template_statistics($template->get('id'));
+        $this->templatestatistics = new template_statistics($template->get_id());
         $this->competencies = api::list_competencies_in_template($template);
         $this->canmanagecompetencyframeworks = has_capability('moodle/competency:competencymanage', $this->pagecontext);
         $this->canmanagetemplatecompetencies = has_capability('moodle/competency:templatemanage', $this->pagecontext);
@@ -96,13 +95,20 @@ class template_competencies_page implements renderable, templatable {
         $data->template = (new template_exporter($this->template))->export($output);
         $data->pagecontextid = $this->pagecontext->id;
         $data->competencies = array();
-        $helper = new performance_helper();
+        $contextcache = array();
+        $frameworkcache = array();
         foreach ($this->competencies as $competency) {
-            $context = $helper->get_context_from_competency($competency);
-            $framework = $helper->get_framework_from_competency($competency);
+            if (!isset($contextcache[$competency->get_competencyframeworkid()])) {
+                $contextcache[$competency->get_competencyframeworkid()] = $competency->get_context();
+            }
+            $context = $contextcache[$competency->get_competencyframeworkid()];
+            if (!isset($frameworkcache[$competency->get_competencyframeworkid()])) {
+                $frameworkcache[$competency->get_competencyframeworkid()] = $competency->get_framework();
+            }
+            $framework = $frameworkcache[$competency->get_competencyframeworkid()];
 
-            $courses = api::list_courses_using_competency($competency->get('id'));
-            $relatedcompetencies = api::list_related_competencies($competency->get('id'));
+            $courses = api::list_courses_using_competency($competency->get_id());
+            $relatedcompetencies = api::list_related_competencies($competency->get_id());
 
             $related = array(
                 'competency' => $competency,

admin/tool/lp/classes/output/template_plans_table.php

@@ -151,7 +151,7 @@ class template_plans_table extends table_sql {
                   FROM {" . \core_competency\plan::TABLE . "} p
                   JOIN {user} u ON u.id = p.userid
                  WHERE p.templateid = :templateid";
-        $params = array('templateid' => $this->template->get('id'));
+        $params = array('templateid' => $this->template->get_id());
 
         // Add order by if needed.
         if (!$count && $sqlsort = $this->get_sql_sort()) {

admin/tool/lp/classes/output/user_competency_course_navigation.php

@@ -27,9 +27,8 @@ use renderable;
 use renderer_base;
 use templatable;
 use context_course;
-use core_competency\external\competency_exporter;
-use core_user\external\user_summary_exporter;
-use core_competency\external\performance_helper;
+use \core_competency\external\competency_exporter;
+use \core_competency\external\user_summary_exporter;
 use stdClass;
 
 /**
@@ -119,9 +118,14 @@ class user_competency_course_navigation implements renderable, templatable {
 
         $coursecompetencies = \core_competency\api::list_course_competencies($this->courseid);
         $data->competencies = array();
-        $helper = new performance_helper();
+        $contextcache = array();
         foreach ($coursecompetencies as $coursecompetency) {
-            $coursecompetencycontext = $helper->get_context_from_competency($coursecompetency['competency']);
+            $frameworkid = $coursecompetency['competency']->get_competencyframeworkid();
+            if (!isset($contextcache[$frameworkid])) {
+                $contextcache[$frameworkid] = $coursecompetency['competency']->get_context();
+            }
+            $context = $contextcache[$frameworkid];
+            $coursecompetencycontext = $context;
             $exporter = new competency_exporter($coursecompetency['competency'], array('context' => $coursecompetencycontext));
             $competency = $exporter->export($output);
             if ($competency->id == $this->competencyid) {

admin/tool/lp/classes/output/user_competency_summary.php

@@ -65,7 +65,7 @@ class user_competency_summary implements renderable, templatable {
      */
     public function export_for_template(renderer_base $output) {
         if (!isset($related['user'])) {
-            $related['user'] = core_user::get_user($this->usercompetency->get('userid'));
+            $related['user'] = core_user::get_user($this->usercompetency->get_userid());
         }
         if (!isset($related['competency'])) {
             $related['competency'] = $this->usercompetency->get_competency();
@@ -75,8 +75,8 @@ class user_competency_summary implements renderable, templatable {
             'usercompetency' => $this->usercompetency,
             'usercompetencyplan' => null,
             'usercompetencycourse' => null,
-            'evidence' => api::list_evidence($this->usercompetency->get('userid'), $this->usercompetency->get('competencyid')),
-            'relatedcompetencies' => api::list_related_competencies($this->usercompetency->get('competencyid'))
+            'evidence' => api::list_evidence($this->usercompetency->get_userid(), $this->usercompetency->get_competencyid()),
+            'relatedcompetencies' => api::list_related_competencies($this->usercompetency->get_competencyid())
         );
         $exporter = new user_competency_summary_exporter(null, $related);
         $data = $exporter->export($output);

admin/tool/lp/classes/output/user_competency_summary_in_course.php

@@ -76,7 +76,7 @@ class user_competency_summary_in_course implements renderable, templatable {
             throw new \invalid_parameter_exception('Invalid params. The competency does not belong to the course.');
         }
 
-        $relatedcompetencies = api::list_related_competencies($competency->get('id'));
+        $relatedcompetencies = api::list_related_competencies($competency->get_id());
         $user = $DB->get_record('user', array('id' => $this->userid));
         $evidence = api::list_evidence_in_course($this->userid, $this->courseid, $this->competencyid);
         $course = $DB->get_record('course', array('id' => $this->courseid));

admin/tool/lp/classes/output/user_competency_summary_in_plan.php

@@ -74,10 +74,10 @@ class user_competency_summary_in_plan implements renderable, templatable {
             throw new \invalid_parameter_exception('Invalid params. The competency does not belong to the plan.');
         }
 
-        $relatedcompetencies = api::list_related_competencies($competency->get('id'));
-        $userid = $plan->get('userid');
+        $relatedcompetencies = api::list_related_competencies($competency->get_id());
+        $userid = $plan->get_userid();
         $user = $DB->get_record('user', array('id' => $userid));
-        $evidence = api::list_evidence($userid, $this->competencyid, $plan->get('id'));
+        $evidence = api::list_evidence($userid, $this->competencyid, $plan->get_id());
 
         $params = array(
             'competency' => $competency,

admin/tool/lp/classes/page_helper.php

@@ -121,7 +121,7 @@ class page_helper {
         $templateurl = null;
         if ($template) {
             $templateurl = new moodle_url('/admin/tool/lp/templatecompetencies.php', [
-                'templateid' => $template->get('id'),
+                'templateid' => $template->get_id(),
                 'pagecontextid' => $pagecontextid
             ]);
         }
@@ -135,7 +135,7 @@ class page_helper {
         $PAGE->set_context($pagecontext);
 
         if (!empty($template)) {
-            $title = format_string($template->get('shortname'), true, array('context' => $context));
+            $title = format_string($template->get_shortname(), true, array('context' => $context));
         } else {
             $title = get_string('templates', 'tool_lp');
         }
@@ -199,7 +199,7 @@ class page_helper {
         $plansurl = new moodle_url('/admin/tool/lp/plans.php', array('userid' => $userid));
         $planurl = null;
         if ($plan) {
-            $planurl = new moodle_url('/admin/tool/lp/plan.php', array('id' => $plan->get('id')));
+            $planurl = new moodle_url('/admin/tool/lp/plan.php', array('id' => $plan->get_id()));
         }
 
         $returnurl = $plansurl;
@@ -218,7 +218,7 @@ class page_helper {
         }
 
         if (!empty($plan)) {
-            $title = format_string($plan->get('name'), true, array('context' => $context));
+            $title = format_string($plan->get_name(), true, array('context' => $context));
         } else {
             $title = get_string('learningplans', 'tool_lp');
         }
@@ -273,7 +273,7 @@ class page_helper {
         $evidencelisturl = new moodle_url('/admin/tool/lp/user_evidence_list.php', array('userid' => $userid));
         $evidenceurl = null;
         if ($evidence) {
-            $evidenceurl = new moodle_url('/admin/tool/lp/user_evidence.php', array('id' => $evidence->get('id')));
+            $evidenceurl = new moodle_url('/admin/tool/lp/user_evidence.php', array('id' => $evidence->get_id()));
         }
 
         $returnurl = $evidencelisturl;
@@ -292,7 +292,7 @@ class page_helper {
         }
 
         if (!empty($evidence)) {
-            $title = format_string($evidence->get('name'), true, array('context' => $context));
+            $title = format_string($evidence->get_name(), true, array('context' => $context));
         } else {
             $title = get_string('userevidence', 'tool_lp');
         }
@@ -352,7 +352,7 @@ class page_helper {
             $url->remove_params(array('id'));
             $PAGE->navbar->add($pagesubtitle, $url);
         } else {
-            $pagetitle = $framework->get('shortname');
+            $pagetitle = $framework->get_shortname();
             $pagesubtitle = get_string('editcompetencyframework', 'tool_lp');
             if ($returntype == 'competencies') {
                 $frameworksurl = new moodle_url('/admin/tool/lp/competencies.php', array(
@@ -417,18 +417,18 @@ class page_helper {
 
         // Set return url.
         $returnurloptions = [
-            'competencyframeworkid' => $framework->get('id'),
+            'competencyframeworkid' => $framework->get_id(),
             'pagecontextid' => $pagecontextid
         ];
         $returnurl = new moodle_url('/admin/tool/lp/competencies.php', $returnurloptions);
-        $PAGE->navbar->add($framework->get('shortname'), $returnurl);
+        $PAGE->navbar->add($framework->get_shortname(), $returnurl);
 
         // Set page layout.
         $PAGE->set_pagelayout('admin');
 
         if (empty($competency)) {
             // Add mode.
-            $title = format_string($framework->get('shortname'), true, ['context' => $pagecontext]);
+            $title = format_string($framework->get_shortname(), true, ['context' => $pagecontext]);
 
             // Set the sub-title for add mode.
             $level = $parent ? $parent->get_level() + 1 : 1;
@@ -436,7 +436,7 @@ class page_helper {
 
         } else {
             // Edit mode.
-            $title = format_string($competency->get('shortname'), true, ['context' => $competency->get_context()]);
+            $title = format_string($competency->get_shortname(), true, ['context' => $competency->get_context()]);
 
             // Add competency name to breadcrumbs, if available.
             $PAGE->navbar->add($title);

admin/tool/lp/competencies.php

@@ -41,18 +41,18 @@ if (!\core_competency\competency_framework::can_read_context($context)) {
 }
 
 $title = get_string('competencies', 'core_competency');
-$pagetitle = get_string('competenciesforframework', 'tool_lp', $framework->get('shortname'));
+$pagetitle = get_string('competenciesforframework', 'tool_lp', $framework->get_shortname());
 
 // Set up the page.
-$url = new moodle_url("/admin/tool/lp/competencies.php", array('competencyframeworkid' => $framework->get('id'),
+$url = new moodle_url("/admin/tool/lp/competencies.php", array('competencyframeworkid' => $framework->get_id(),
     'pagecontextid' => $pagecontextid));
 $frameworksurl = new moodle_url('/admin/tool/lp/competencyframeworks.php', array('pagecontextid' => $pagecontextid));
 
-$PAGE->set_context($pagecontext);
 $PAGE->navigation->override_active_url($frameworksurl);
+$PAGE->set_context($pagecontext);
 $PAGE->set_pagelayout('admin');
 $PAGE->set_url($url);
-$PAGE->navbar->add($framework->get('shortname'), $url);
+$PAGE->navbar->add($framework->get_shortname(), $url);
 $PAGE->set_title($title);
 $PAGE->set_heading($title);
 $output = $PAGE->get_renderer('tool_lp');

admin/tool/lp/db/renamedclasses.php

@@ -1,32 +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 file contains renamed classes mappings.
- *
- * @package    tool_lp
- * @copyright  2016 Frédéric Massart - FMCorz.net
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-$renamedclasses = array(
-    'tool_lp\\external\\cohort_summary_exporter' => 'core_cohort\\external\\cohort_summary_exporter',
-    'tool_lp\\external\\course_module_summary_exporter' => 'core_course\\external\\course_module_summary_exporter',
-    'tool_lp\\external\\course_summary_exporter' => 'core_course\\external\\course_summary_exporter',
-    'tool_lp\\form\\persistent' => 'core\\form\\persistent',
-);

admin/tool/lp/editcompetency.php

@@ -63,7 +63,7 @@ if ($competency) {
 // Get page URL.
 $urloptions = [
     'id' => $id,
-    'competencyframeworkid' => $competencyframework->get('id'),
+    'competencyframeworkid' => $competencyframework->get_id(),
     'parentid' => $parentid,
     'pagecontextid' => $pagecontextid
 ];

admin/tool/lp/editcompetencyframework.php

@@ -58,7 +58,7 @@ if ($form->is_cancelled()) {
         $framework = \core_competency\api::create_framework($data);
         $frameworkmanageurl = new moodle_url('/admin/tool/lp/competencies.php', array(
             'pagecontextid' => $pagecontextid,
-            'competencyframeworkid' => $framework->get('id')
+            'competencyframeworkid' => $framework->get_id()
         ));
         $messagesuccess = get_string('competencyframeworkcreated', 'tool_lp');
         redirect($frameworkmanageurl, $messagesuccess, 0, \core\output\notification::NOTIFY_SUCCESS);

admin/tool/lp/editplan.php

@@ -42,7 +42,7 @@ if (empty($id)) {
     $plan = \core_competency\api::read_plan($id);
 
     // The userid parameter must be the same as the owner of the plan.
-    if ($userid != $plan->get('userid')) {
+    if ($userid != $plan->get_userid()) {
         throw new coding_exception('Inconsistency between the userid parameter and the userid of the plan');
     }
 
@@ -81,7 +81,7 @@ $data = $form->get_data();
 if ($data) {
     if (empty($data->id)) {
         $plan = \core_competency\api::create_plan($data);
-        $returnurl = new moodle_url('/admin/tool/lp/plan.php', ['id' => $plan->get('id')]);
+        $returnurl = new moodle_url('/admin/tool/lp/plan.php', ['id' => $plan->get_id()]);
         $returnmsg = get_string('plancreated', 'tool_lp');
     } else {
         \core_competency\api::update_plan($data);