Merge branch 'MOODLE_401_STABLE' into MOODLE_401_STABLE_GIPRECIA

admin/tool/admin_presets/tests/behat/download.feature

@@ -5,16 +5,18 @@ Feature: I can download a preset
       | name       |
       | Custom preset |
 
-  @javascript
   Scenario: Custom preset settings can be downloaded
     Given I log in as "admin"
     And I navigate to "Site admin presets" in site administration
     When I open the action menu in "Custom preset" "table_row"
-    Then following "Download" "link" in the "Custom preset" "table_row" should download between "0" and "5000" bytes
+    Then following "Download" in the "Custom preset" "table_row" should download a file that:
+      | Has mimetype                 | text/xml      |
+      | Contains text in xml element | Custom preset |
 
-  @javascript
   Scenario: Core preset settings can be downloaded
     Given I log in as "admin"
     And I navigate to "Site admin presets" in site administration
     When I open the action menu in "Starter" "table_row"
-    Then following "Download" "link" in the "Starter" "table_row" should download between "0" and "5000" bytes
+    Then following "Download" in the "Starter" "table_row" should download a file that:
+      | Has mimetype                 | text/xml |
+      | Contains text in xml element | Starter  |

admin/tool/dataprivacy/tests/behat/dataexport.feature

@@ -55,7 +55,8 @@ Feature: Data export from the privacy API
     And I reload the page
     And I should see "Download ready" in the "Victim User 1" "table_row"
     And I open the action menu in "Victim User 1" "table_row"
-    And following "Download" should download between "1" and "150000" bytes
+    And following "Download" should download a file that:
+      | Contains file in zip | index.html |
     And the following config values are set as admin:
       | privacyrequestexpiry | 1 | tool_dataprivacy |
     And I wait "1" seconds
@@ -90,7 +91,8 @@ Feature: Data export from the privacy API
     And I reload the page
     And I should see "Download ready" in the "Export all of my personal data" "table_row"
     And I open the action menu in "Victim User 1" "table_row"
-    And following "Download" should download between "1" and "155000" bytes
+    And following "Download" should download a file that:
+      | Contains file in zip | index.html |
 
     And the following config values are set as admin:
       | privacyrequestexpiry | 1 | tool_dataprivacy |
@@ -128,7 +130,8 @@ Feature: Data export from the privacy API
     And I reload the page
     And I should see "Download ready" in the "Victim User 1" "table_row"
     And I open the action menu in "Victim User 1" "table_row"
-    And following "Download" should download between "1" and "150000" bytes
+    And following "Download" should download a file that:
+      | Contains file in zip | index.html |
 
     And the following config values are set as admin:
       | privacyrequestexpiry | 1 | tool_dataprivacy |

analytics/tests/behat/manage_models.feature

@@ -146,7 +146,8 @@ Feature: Manage analytics models
     When I open the action menu in "Students at risk of not meeting the course completion conditions" "table_row"
     And I choose "Export" in the open action menu
     And I click on "Actions" "link" in the "Students at risk of not meeting the course completion conditions" "table_row"
-    And following "Export" should download between "100" and "500" bytes
+    And following "Export" should download a file that:
+       | Contains file in zip | model-config.json |
 
   Scenario: Check invalid site elements
     When I open the action menu in "Students at risk of not meeting the course completion conditions" "table_row"

blocks/accessreview/styles.css

@@ -1,22 +1,22 @@
 .block_accessreview_success,
 .block_accessreview.block_accessreview_success.hasinfo {
     color: #1e451e;
-    background: #d7e6d7;
-    border-color: #c8ddc8;
+    background: #eff5ef;
+    box-shadow: 0 0 2px 2px #619a61;
 }
 
 .block_accessreview_danger,
 .block_accessreview.block_accessreview_danger.hasinfo {
     color: #6e211e;
-    background: #f6d9d8;
-    border-color: #f3c9c8;
+    background: #fdf7f7;
+    box-shadow: 0 0 2px 2px #da6960;
 }
 
 .block_accessreview_warning,
 .block_accessreview.block_accessreview_warning.hasinfo {
-    color: #7d5a29;
-    background: #fcefdc;
-    border-color: #fbe8cd;
+    color: #694b21;
+    background: #fdf2e3;
+    box-shadow: 0 0 2px 2px #c97a0e;
 }
 
 .block_accessreview_table {

blocks/rss_client/editfeed.php

@@ -180,7 +180,18 @@ public static function autodiscover_feed_url($url){
 
 if ($rssid) {
     $isadding = false;
-    $rssrecord = $DB->get_record('block_rss_client', array('id' => $rssid), '*', MUST_EXIST);
+
+    if ($managesharedfeeds) {
+        $select = 'id = :id AND (userid = :userid OR shared = 1)';
+    } else {
+        $select = 'id = :id AND userid = :userid';
+    }
+
+    $rssrecord = $DB->get_record_select('block_rss_client', $select, [
+        'id' => $rssid,
+        'userid' => $USER->id,
+    ], '*', MUST_EXIST);
+
 } else {
     $isadding = true;
     $rssrecord = new stdClass;

blocks/rss_client/managefeeds.php

@@ -61,20 +61,27 @@
 $baseurl = new moodle_url('/blocks/rss_client/managefeeds.php', $urlparams);
 $PAGE->set_url($baseurl);
 
+if ($managesharedfeeds) {
+    $select = '(userid = :userid OR shared = 1)';
+} else {
+    $select = 'userid = :userid';
+}
+
 // Process any actions
 if ($deleterssid && confirm_sesskey()) {
-    $DB->delete_records('block_rss_client', array('id'=>$deleterssid));
+
+    $deleterssid = $DB->get_field_select('block_rss_client', 'id', "id = :id AND {$select}", [
+        'id' => $deleterssid,
+        'userid' => $USER->id
+    ], MUST_EXIST);
+
+    $DB->delete_records('block_rss_client', ['id' => $deleterssid]);
 
     redirect($PAGE->url, get_string('feeddeleted', 'block_rss_client'));
 }
 
 // Display the list of feeds.
-if ($managesharedfeeds) {
-    $select = '(userid = ' . $USER->id . ' OR shared = 1)';
-} else {
-    $select = 'userid = ' . $USER->id;
-}
-$feeds = $DB->get_records_select('block_rss_client', $select, null, $DB->sql_order_by_text('title'));
+$feeds = $DB->get_records_select('block_rss_client', $select, ['userid' => $USER->id], $DB->sql_order_by_text('title'));
 
 $strmanage = get_string('managefeeds', 'block_rss_client');
 

grade/report/grader/tests/behat/ajax_grader.feature

@@ -68,9 +68,9 @@ Feature: Using the AJAX grading feature of Grader report to update grades and fe
     And I should not see a feedback field for "Student 2" and grade item "Item VU"
     And I click on student "Student 3" for grade item "Item SU"
     And I set the field "ajaxgrade" to "Very good"
-    And I press the shift tab key
-    And I press the tab key
-    And I press the shift tab key
+    # Workaround for the Firefox 130.0 issue with the enter key and the old ajax grader element.
+    And I click on student "Student 3" for grade item "Item SU"
+    And I press the enter key
     And I click on student "Student 3" for grade item "Item VU"
     And I set the field "ajaxgrade" to "50"
     And I press the enter key

install/lang/ia/admin.php

@@ -31,3 +31,11 @@
 
 $string['clianswerno'] = 'n';
 $string['cliansweryes'] = 's';
+$string['cliincorrectvalueerror'] = 'Error, valor incorrecte "{$a->value}" for "{$a->option}"';
+$string['cliincorrectvalueretry'] = 'Valor incorrecte, per favor essaya novemente';
+$string['clitypevalue'] = 'valor de typo';
+$string['clitypevaluedefault'] = 'valor de typo,pressa Enter per usar le vaor predefinite ({$a})';
+$string['cliunknowoption'] = 'Uotiones non recognoscite:
+ {$a}
+Per favor usa le option --help.';
+$string['cliyesnoprompt'] = 'typa s (significa si) o n (significa no)';

install/lang/ia/moodle.php

@@ -0,0 +1,36 @@
+<?php
+// This file is part of Moodle - https://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 <https://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['language'] = 'Linguage';
+$string['moodlelogo'] = 'Logo de Moodle';
+$string['next'] = 'Proxime';
+$string['previous'] = 'Previe';
+$string['reload'] = 'Recarga';

install/lang/ro/admin.php

@@ -41,4 +41,4 @@
 $string['cliyesnoprompt'] = 'tastează d (pentru \'da\') sau \'n\' (pentru \'nu\')';
 $string['environmentrequireinstall'] = 'trebuie instalat şi activat';
 $string['environmentrequireversion'] = 'versiuna necesară este {$a->needed} în timp ce dumneavoastră rulaţi versiunea {$a->current}';
-$string['upgradekeyset'] = 'Actualizează cheie  (lăsați gol pentru a nu fi setat)';
+$string['upgradekeyset'] = 'Actualizează cheie (lăsați necompletat pentru a nu fi setat)';

lang/en/message.php

@@ -263,7 +263,7 @@
 $string['unreadnewgroupconversationmessage'] = 'New message from {$a->name} in {$a->conversationname}';
 $string['unreadnewmessage'] = 'New message from {$a}';
 $string['useentertosend'] = 'Use enter to send';
-$string['usercantbemessaged'] = 'You can\'t message {$a} due to their message preferences. Try adding them as a contact.';
+$string['usercantbemessaged'] = 'You can\'t message this user due to their message preferences. Try adding them as a contact.';
 $string['userwouldliketocontactyou'] = '{$a} would like to contact you';
 $string['viewfullnotification'] = 'View full notification';
 $string['viewmessageswith'] = 'View messages with {$a}';