Merge branch 'MOODLE_401_STABLE' into MOODLE_401_STABLE_GIPRECIA

.grunt/jsdoc/README.md

@@ -16,4 +16,4 @@ Moodle - the world's open source learning platform
 This generated documentation includes API documentation for JavaScript written in the AMD and ES2015 module formats within Moodle.
 
 ## Related information
-See [https://docs.moodle.org/dev](https://docs.moodle.org/dev) for other related Developer Documentation.
+See [https://moodledev.io](https://moodledev.io) for other related Developer Documentation.

.grunt/jsdoc/jsdoc.conf.js

@@ -114,7 +114,7 @@ module.exports = {
         ],
         "menu": {
             "Developer Docs": {
-                href: "https://docs.moodle.org/dev",
+                href: "https://moodledev.io",
                 target: "_blank",
                 "class": "menu-item",
                 id: "devdocs"

CONTRIBUTING.txt

@@ -6,7 +6,7 @@ of developers, designers, teachers, testers, translators and other users. We
 work in universities, schools, companies and other places. You are very welcome
 to join us and contribute to the project.
 
-See <https://docs.moodle.org/dev/Contributing_to_Moodle> for the many ways you
+See <https://moodledev.io/general/community/contribute> for the many ways you
 can help, not only with coding.
 
 Moodle is open to community contributions to core, though all code must go
@@ -35,7 +35,7 @@ submitted patches has evolved.
 * New features are developed on the master branch. Bug fixes are also
   backported to currently supported maintenance (stable) branches.
 
-For further details, see <https://docs.moodle.org/dev/Process>.
+For further details, see <https://moodledev.io/general/development/process>.
 
 Moodle plugins
 --------------
@@ -53,4 +53,4 @@ be easily installed and updated via the Moodle administration interface.
   the plugins directory. We do not pull from your code repository; you must do
   it explicitly.
 
-For further details, see <https://docs.moodle.org/dev/Plugin_contribution>.
+For further details, see <https://moodledev.io/general/community/plugincontribution>.

README.txt

@@ -20,7 +20,7 @@ Moodle is widely used around the world by universities, schools, companies and
 all manner of organisations and individuals.
 
 Moodle is provided freely as open source software, under the GNU General Public
-License <https://docs.moodle.org/dev/License>.
+License <https://moodledev.io/general/license>.
 
 Moodle is written in PHP and JavaScript and uses an SQL database for storing
 the data.

admin/localplugins.php

@@ -21,7 +21,7 @@
  * Displays the list of found local plugins, their version (if found) and
  * a link to delete the local plugin.
  *
- * @see       http://docs.moodle.org/dev/Local_customisation
+ * @see       https://moodledev.io/docs/apis/plugintypes/local
  * @package   admin
  * @copyright 2010 David Mudrak <david.mudrak@gmail.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later

admin/plagiarism.php

@@ -20,7 +20,7 @@
  * Displays the list of found plagiarism plugins, their version (if found) and
  * a link to uninstall the plagiarism plugin.
  *
- * @see       http://docs.moodle.org/dev/Plagiarism_API
+ * @see       https://moodledev.io/docs/apis/subsystems/plagiarism
  * @package   admin
  * @copyright 2012 Dan Marsden <dan@danmarsden.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later

admin/renderer.php

@@ -44,7 +44,7 @@ public function install_licence_page() {
         $output .= $this->heading(get_string('copyrightnotice'));
         $output .= $this->box($copyrightnotice, 'copyrightnotice');
         $output .= html_writer::empty_tag('br');
-        $output .= $this->confirm(get_string('doyouagree'), $continue, "http://docs.moodle.org/dev/License");
+        $output .= $this->confirm(get_string('doyouagree'), $continue, "https://moodledev.io/general/license");
         $output .= $this->footer();
 
         return $output;
@@ -746,10 +746,10 @@ protected function moodle_copyright() {
         //////////////////////////////////////////////////////////////////////////////////////////////////
         ////  IT IS ILLEGAL AND A VIOLATION OF THE GPL TO HIDE, REMOVE OR MODIFY THIS COPYRIGHT NOTICE ///
         $copyrighttext = '<a href="http://moodle.org/">Moodle</a> '.
-                         '<a href="http://docs.moodle.org/dev/Releases" title="'.$CFG->version.'">'.$CFG->release.'</a><br />'.
+                         '<a href="https://moodledev.io/general/releases" title="'.$CFG->version.'">'.$CFG->release.'</a><br />'.
                          'Copyright &copy; 1999 onwards, Martin Dougiamas<br />'.
                          'and <a href="http://moodle.org/dev">many other contributors</a>.<br />'.
-                         '<a href="http://docs.moodle.org/dev/License">GNU Public License</a>';
+                         '<a href="https://moodledev.io/general/license">GNU Public License</a>';
         //////////////////////////////////////////////////////////////////////////////////////////////////
 
         return $this->box($copyrighttext, 'copyright');
@@ -993,7 +993,7 @@ protected function moodle_available_update_info(\core\update\info $updateinfo) {
      * @return string HTML to output.
      */
     protected function release_notes_link() {
-        $releasenoteslink = get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/dev/Releases');
+        $releasenoteslink = get_string('releasenoteslink', 'admin', 'https://moodledev.io/general/releases');
         $releasenoteslink = str_replace('target="_blank"', 'onclick="this.target=\'_blank\'"', $releasenoteslink); // extremely ugly validation hack
         return $this->box($releasenoteslink, 'generalbox alert alert-info');
     }

admin/tool/componentlibrary/content/library/moodle-templates.md

@@ -9,7 +9,7 @@ menu: "main"
 
 ## Moodle templates
 
-[Moodle templates](https://docs.moodle.org/dev/Templates) are use to write HTML and Javascript using mustache files.
+[Moodle templates](https://moodledev.io/docs/guides/templates) are use to write HTML and Javascript using mustache files.
 
 If you are creating your own pages in the UI Component library you can load core templates using this (shortcode) syntax:
 
@@ -51,4 +51,3 @@ This is the result of adding the core/notification template on this page:
     "extraclasses": "foo bar"
 }
 {{< /mustache >}}
-

admin/tool/componentlibrary/content/moodle/components/form-elements.md

@@ -11,7 +11,7 @@ tags:
 
 ## How to use moodle forms
 
-Forms are constructed using lib/formslib.php. Using the addElement methods in php a set of different form element types can be added to a form. For more info visit the [Moodledocs](https://docs.moodle.org/dev/lib/formslib.php_Form_Definition) page for forms
+Forms are constructed using lib/formslib.php. Using the addElement methods in php a set of different form element types can be added to a form. For more info visit the [Moodledocs](https://moodledev.io/docs/apis/subsystems/form) page for forms
 
 {{< php >}}
     $mform->addElement('button', 'intro', get_string("buttonlabel"));

admin/tool/componentlibrary/content/moodle/components/toggle.md

@@ -61,7 +61,7 @@ Disabled toggle with extra classes.
 
 ## Use toggle as a template block
 
-It is also possible to include *core/toggle* in any other template using [blocks](https://docs.moodle.org/dev/Templates#Blocks), instead of rendering it with a context.
+It is also possible to include *core/toggle* in any other template using [blocks](https://moodledev.io/docs/guides/templates#blocks), instead of rendering it with a context.
 The parameters that you can define are:
 * id: Unique id for the toggle input.
 * extraclasses: Any extra classes added to the toggle input outer container.

admin/tool/componentlibrary/content/moodle/javascript/confirm.md

@@ -16,23 +16,23 @@ to the element that will trigger the confirmation modal.
 
 ## Source files
 
-* `lib/amd/src/confirm.js` ({{< jsdoc module="core/confirm" >}})
+* `lib/amd/src/utility.js` ({{< jsdoc module="core/utility" >}})
 * `lib/templates/modal.mustache`
 
 ## Usage
 The confirmation AMD module is loaded automatically, so the only thing you need to do is to add some specific data attributes
 to the target element:
 {{< highlight html >}}
 <button type="button" class="btn btn-primary" data-confirmation="modal" data-confirmation-title-str='["delete", "core"]'
-data-confirmation-question-str='["areyousure"]' data-confirmation-yes-button-str='["delete", "core"]'>Show confirmation modal</button>
+data-confirmation-content-str='["areyousure"]' data-confirmation-yes-button-str='["delete", "core"]'>Show confirmation modal</button>
 {{< /highlight >}}
 
 You can also use it on PHP, you just need to set the attributes parameter to any moodle output component that takes attributes:
 {{< php >}}
 echo $OUTPUT->single_button('#', get_string('delete'), 'get', [
     'data-confirmation' => 'modal',
     'data-confirmation-title-str' => json_encode(['delete', 'core']),
-    'data-confirmation-question-str' => json_encode(['areyousure']),
+    'data-confirmation-content-str' => json_encode(['areyousure']),
     'data-confirmation-yes-button-str' => json_encode(['delete', 'core'])
 ]);
 {{< / php >}}
@@ -56,8 +56,8 @@ echo $OUTPUT->single_button('#', get_string('delete'), 'get', [
       <td>The modal title language string identifier, must be provided in JSON encoded format.</td>
     </tr>
     <tr>
-      <td>data-confirmation-question-str</td>
-      <td>The confirmation question language string identifier, must be provided in JSON encoded format.</td>
+      <td>data-confirmation-content-str</td>
+      <td>The confirmation modal main content language string identifier, must be provided in JSON encoded format.</td>
     </tr>
     <tr>
       <td>data-confirmation-yes-button-str</td>
@@ -84,21 +84,21 @@ echo $OUTPUT->single_button('#', get_string('delete'), 'get', [
 
 {{< example >}}
 <button type="button" class="btn btn-primary" data-confirmation="modal" data-confirmation-title-str='["delete", "core"]'
-data-confirmation-question-str='["areyousure"]' data-confirmation-yes-button-str='["delete", "core"]'>Show confirmation modal</button>
+data-confirmation-content-str='["areyousure"]' data-confirmation-yes-button-str='["delete", "core"]'>Show confirmation modal</button>
 {{< /example >}}
 
 ### Confirmation modal with a toast
 
 {{< example >}}
 <button type="button" class="btn btn-primary" data-confirmation="modal" data-confirmation-title-str='["delete", "core"]'
-data-confirmation-question-str='["areyousure"]' data-confirmation-yes-button-str='["delete", "core"]' data-confirmation-toast="true"
+data-confirmation-content-str='["areyousure"]' data-confirmation-yes-button-str='["delete", "core"]' data-confirmation-toast="true"
 data-confirmation-toast-confirmation-str='["deleteblockinprogress", "block", "Online users"]'>Show confirmation modal</button>
 {{< /example >}}
 
 ### Confirmation modal with redirect
 
 {{< example >}}
 <button type="button" class="btn btn-primary" data-confirmation="modal" data-confirmation-title-str='["delete", "core"]'
-data-confirmation-question-str='["areyousure"]' data-confirmation-yes-button-str='["delete", "core"]'
+data-confirmation-content-str='["areyousure"]' data-confirmation-yes-button-str='["delete", "core"]'
 data-confirmation-destination="http://moodle.com">Show confirmation modal</button>
 {{< /example >}}

admin/tool/dataprivacy/tests/behat/behat_tool_dataprivacy.php

@@ -58,7 +58,7 @@ class behat_tool_dataprivacy extends behat_base {
     );
 
     /**
-     * Creates the specified element. More info about available elements in http://docs.moodle.org/dev/Acceptance_testing#Fixtures.
+     * Creates the specified element. More info about available elements in https://moodledev.io/general/development/tools/behat.
      *
      * @Given /^the following data privacy "(?P<element_string>(?:[^"]|\\")*)" exist:$/
      *

admin/tool/licensemanager/tests/behat/license_manager.feature

@@ -10,12 +10,12 @@ Feature: Licence manager
     Then I should see "Licence not specified" in the "unknown" "table_row"
     And I should see "All rights reserved" in the "allrightsreserved" "table_row"
     And I should see "Public domain" in the "public" "table_row"
-    And I should see "Creative Commons" in the "cc" "table_row"
-    And I should see "Creative Commons - NoDerivs" in the "cc-nd" "table_row"
-    And I should see "Creative Commons - No Commercial NoDerivs" in the "cc-nc-nd" "table_row"
-    And I should see "Creative Commons - No Commercial" in the "cc-nc" "table_row"
-    And I should see "Creative Commons - No Commercial ShareAlike" in the "cc-nc-sa" "table_row"
-    And I should see "Creative Commons - ShareAlike" in the "cc-sa" "table_row"
+    And I should see "Creative Commons - 4.0 International" in the "cc-4.0" "table_row"
+    And I should see "Creative Commons - NoDerivatives 4.0 International" in the "cc-nd-4.0" "table_row"
+    And I should see "Creative Commons - NonCommercial-NoDerivatives 4.0 International" in the "cc-nc-nd-4.0" "table_row"
+    And I should see "Creative Commons - NonCommercial-ShareAlike 4.0 International" in the "cc-nc-sa-4.0" "table_row"
+    And I should see "Creative Commons - ShareAlike 4.0 International" in the "cc-sa-4.0" "table_row"
+    And I should see "Creative Commons - NonCommercial 4.0 International" in the "cc-nc-4.0" "table_row"
 
   Scenario: I should be able to enable and disable licences
     Given I log in as "admin"
@@ -25,25 +25,25 @@ Feature: Licence manager
     And I navigate to "Licence > Licence manager" in site administration
     Then "This is the site default licence" "icon" should exist in the "public" "table_row"
     And "Enable licence" "icon" should not exist in the "public" "table_row"
-    And "This is the site default licence" "icon" should not exist in the "cc" "table_row"
+    And "This is the site default licence" "icon" should not exist in the "cc-4.0" "table_row"
     And I navigate to "Licence > Licence settings" in site administration
     And I set the field "Default site licence" to "Creative Commons"
     And I press "Save changes"
     And I navigate to "Licence > Licence manager" in site administration
-    And "This is the site default licence" "icon" should exist in the "cc" "table_row"
-    And "Enable licence" "icon" should not exist in the "cc" "table_row"
+    And "This is the site default licence" "icon" should exist in the "cc-4.0" "table_row"
+    And "Enable licence" "icon" should not exist in the "cc-4.0" "table_row"
     And "This is the site default licence" "icon" should not exist in the "public" "table_row"
 
   @javascript @_file_upload
   Scenario Outline: User licence preference is remembered depending of setting value
     Given the following config values are set as admin:
-      | sitedefaultlicense      | cc                        |
+      | sitedefaultlicense      | cc-4.0                       |
       | rememberuserlicensepref | <rememberuserlicensepref> |
     And I log in as "admin"
     And I follow "Private files" in the user menu
     And I follow "Add..."
     And I follow "Upload a file"
-    And the field with xpath "//select[@name='license']" matches value "Creative Commons"
+    And the field with xpath "//select[@name='license']" matches value "Creative Commons - 4.0 International"
     And I click on "Close" "button" in the "File picker" "dialogue"
     When I upload "lib/tests/fixtures/empty.txt" file to "Files" filemanager as:
       | Save as | empty_copy.txt |
@@ -53,6 +53,6 @@ Feature: Licence manager
     Then the field with xpath "//select[@name='license']" matches value "<expectedlicence>"
 
     Examples:
-      | rememberuserlicensepref | expectedlicence  |
-      | 0                       | Creative Commons |
-      | 1                       | Public domain    |
+      | rememberuserlicensepref | expectedlicence                      |
+      | 0                       | Creative Commons - 4.0 International |
+      | 1                       | Public domain                        |

admin/tool/licensemanager/tests/manager_test.php

@@ -174,24 +174,24 @@ public function test_change_license_order() {
         $this->resetAfterTest();
 
         $licenseorder = array_keys(license_manager::get_licenses());
-        $initialposition = array_search('cc-nc', $licenseorder);
+        $initialposition = array_search('cc-nc-4.0', $licenseorder);
 
         $manager = new tool_licensemanager\manager();
 
         // We're testing a private method, so we need to setup reflector magic.
         $method = new ReflectionMethod('\tool_licensemanager\manager', 'change_license_order');
         $method->setAccessible(true); // Allow accessing of private method.
-        $method->invoke($manager, \tool_licensemanager\manager::ACTION_MOVE_UP, 'cc-nc');
+        $method->invoke($manager, \tool_licensemanager\manager::ACTION_MOVE_UP, 'cc-nc-4.0');
 
         $licenseorder = array_keys(license_manager::get_licenses());
-        $newposition = array_search('cc-nc', $licenseorder);
+        $newposition = array_search('cc-nc-4.0', $licenseorder);
 
         $this->assertLessThan($initialposition, $newposition);
 
         $initialposition = array_search('allrightsreserved', $licenseorder);
         $method->invoke($manager, \tool_licensemanager\manager::ACTION_MOVE_DOWN, 'allrightsreserved');
         $licenseorder = array_keys(license_manager::get_licenses());
-        $newposition = array_search('cc-nc', $licenseorder);
+        $newposition = array_search('cc-nc-4.0', $licenseorder);
 
         $this->assertGreaterThan($initialposition, $newposition);
     }

admin/tool/lp/tests/behat/behat_tool_lp_data_generators.php

@@ -94,7 +94,7 @@ class behat_tool_lp_data_generators extends behat_base {
     );
 
     /**
-     * Creates the specified element. More info about available elements in http://docs.moodle.org/dev/Acceptance_testing#Fixtures.
+     * Creates the specified element. More info about available elements in https://moodledev.io/general/development/tools/behat.
      *
      * @Given /^the following lp "(?P<element_string>(?:[^"]|\\")*)" exist:$/
      *

admin/tool/messageinbound/classes/manager.php

@@ -829,7 +829,7 @@ private function is_bulk_message(
 
         // An auto-reply may itself include the Bulk Precedence.
         $precedence = $messagedata->getHeaderText(0, \Horde_Imap_Client_Data_Fetch::HEADER_PARSE)->getValue('Precedence');
-        $isbulk = $isbulk || strtolower($precedence) == 'bulk';
+        $isbulk = $isbulk || strtolower($precedence ?? '') == 'bulk';
 
         // If the X-Autoreply header is set, and not 'no', then this is an automatic reply.
         $autoreply = $messagedata->getHeaderText(0, \Horde_Imap_Client_Data_Fetch::HEADER_PARSE)->getValue('X-Autoreply');

admin/tool/moodlenet/tests/local/remote_resource_test.php

@@ -98,7 +98,15 @@ public function test_network_features() {
             ]
         );
 
-        $this->assertGreaterThan(0, $remoteres->get_download_size());
+        // We need to handle size of -1 (missing "Content-Length" header), or where it is set and greater than zero.
+        $this->assertThat(
+            $remoteres->get_download_size(),
+            $this->logicalOr(
+                $this->equalTo(-1),
+                $this->greaterThan(0),
+            ),
+        );
+
         [$path, $name] = $remoteres->download_to_requestdir();
         $this->assertIsString($path);
         $this->assertEquals('test.html', $name);

admin/tool/uploadcourse/classes/tracker.php

@@ -173,13 +173,16 @@ public function output($line, $outcome, $status, $data) {
             } else {
                 $outcome = $OUTPUT->pix_icon('i/invalid', '');
             }
+
             echo html_writer::start_tag('tr', array('class' => 'r' . $this->rownb % 2));
             echo html_writer::tag('td', $line, array('class' => 'c' . $ci++));
             echo html_writer::tag('td', $outcome, array('class' => 'c' . $ci++));
             echo html_writer::tag('td', isset($data['id']) ? $data['id'] : '', array('class' => 'c' . $ci++));
-            echo html_writer::tag('td', isset($data['shortname']) ? $data['shortname'] : '', array('class' => 'c' . $ci++));
-            echo html_writer::tag('td', isset($data['fullname']) ? $data['fullname'] : '', array('class' => 'c' . $ci++));
-            echo html_writer::tag('td', isset($data['idnumber']) ? $data['idnumber'] : '', array('class' => 'c' . $ci++));
+
+            // Ensure our data is suitable for HTML output.
+            echo html_writer::tag('td', isset($data['shortname']) ? s($data['shortname']) : '', array('class' => 'c' . $ci++));
+            echo html_writer::tag('td', isset($data['fullname']) ? s($data['fullname']) : '', array('class' => 'c' . $ci++));
+            echo html_writer::tag('td', isset($data['idnumber']) ? s($data['idnumber']) : '', array('class' => 'c' . $ci++));
             echo html_writer::tag('td', $status, array('class' => 'c' . $ci++));
             echo html_writer::end_tag('tr');
         }