Merge branch 'MOODLE_401_STABLE' into MOODLE_401_STABLE_GIPRECIA

admin/category.php

@@ -131,8 +131,7 @@
     $outputhtml .= html_writer::end_tag('div');
 }
 
-$visiblepathtosection = array_reverse($settingspage->visiblepath);
-$PAGE->set_title("$SITE->shortname: " . implode(": ",$visiblepathtosection));
+$PAGE->set_title(implode(moodle_page::TITLE_SEPARATOR, $settingspage->visiblepath));
 $PAGE->set_heading($SITE->fullname);
 if ($buttons) {
     $PAGE->set_button($buttons);

admin/environment.xml

@@ -4301,6 +4301,8 @@
       </CUSTOM_CHECK>
       <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mod_assignment" level="required">
       </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_db_prefix_length" level="required">
+      </CUSTOM_CHECK>
     </CUSTOM_CHECKS>
   </MOODLE>
 </COMPATIBILITY_MATRIX>

admin/index.php

@@ -224,7 +224,7 @@
         $strlicense = get_string('license');
 
         $PAGE->navbar->add($strlicense);
-        $PAGE->set_title($strinstallation.' - Moodle '.$CFG->target_release);
+        $PAGE->set_title($strinstallation . moodle_page::TITLE_SEPARATOR . 'Moodle ' . $CFG->target_release, false);
         $PAGE->set_heading($strinstallation);
         $PAGE->set_cacheable(false);
 
@@ -267,7 +267,7 @@
     upgrade_init_javascript();
 
     $PAGE->navbar->add($strdatabasesetup);
-    $PAGE->set_title($strinstallation.' - Moodle '.$CFG->target_release);
+    $PAGE->set_title($strinstallation . moodle_page::TITLE_SEPARATOR . $CFG->target_release, false);
     $PAGE->set_heading($strinstallation);
     $PAGE->set_cacheable(false);
 
@@ -811,7 +811,7 @@
 
 if (!has_capability('moodle/site:config', $context)) {
     // Do not throw exception display an empty page with administration menu if visible for current user.
-    $PAGE->set_title($SITE->fullname);
+    $PAGE->set_title(get_string('home'));
     $PAGE->set_heading($SITE->fullname);
     echo $OUTPUT->header();
     echo $OUTPUT->footer();

admin/presets/classes/local/setting/adminpresets_admin_setting_configmultiselect.php

@@ -26,42 +26,14 @@
  */
 class adminpresets_admin_setting_configmultiselect extends adminpresets_setting {
 
-    /**
-     * Ensure that the $value values are setting choices.
-     *
-     * @param mixed $value Setting value
-     * @return mixed Returns false if wrong param value
-     */
-    protected function set_value($value) {
-        if ($value) {
-            $options = explode(',', $value);
-            foreach ($options as $option) {
-
-                foreach ($this->settingdata->choices as $key => $choice) {
-
-                    if ($key == $option) {
-                        $this->value = $option;
-                        $this->set_visiblevalue();
-                        return true;
-                    }
-                }
-            }
-
-            $value = implode(',', $options);
-        }
-        $this->value = $value;
-        $this->set_visiblevalue();
-
-        return true;
-    }
-
     protected function set_visiblevalue() {
         $values = explode(',', $this->value);
         $visiblevalues = [];
 
         foreach ($values as $value) {
 
-            if (!empty($this->settingdata->choices[$value])) {
+            // Ensure that each value exists as a setting choice.
+            if (array_key_exists($value, $this->settingdata->choices)) {
                 $visiblevalues[] = $this->settingdata->choices[$value];
             }
         }

admin/renderer.php

@@ -898,7 +898,8 @@ protected function campaign_content(bool $showcampaigncontent): string {
         $url = "https://campaign.moodle.org/current/lms/{$lang}/install/";
         $params = [
             'url' => $url,
-            'iframeid' => 'campaign-content'
+            'iframeid' => 'campaign-content',
+            'title' => get_string('campaign', 'admin'),
         ];
 
         return $this->render_from_template('core/external_content_banner', $params);
@@ -919,7 +920,8 @@ protected function services_and_support_content(bool $showservicesandsupport): s
         $url = "https://campaign.moodle.org/current/lms/{$lang}/servicesandsupport/";
         $params = [
             'url' => $url,
-            'iframeid' => 'services-support-content'
+            'iframeid' => 'services-support-content',
+            'title' => get_string('supportandservices', 'admin'),
         ];
 
         return $this->render_from_template('core/external_content_banner', $params);

admin/searchreindex.php

@@ -32,7 +32,7 @@
 admin_externalpage_setup('searchareas', '', null, (new moodle_url('/admin/searchreindex.php'))->out(false));
 
 // Get area parameter and check it exists.
-$areaid = required_param('areaid', PARAM_ALPHAEXT);
+$areaid = required_param('areaid', PARAM_ALPHANUMEXT);
 $area = \core_search\manager::get_search_area($areaid);
 if ($area === false) {
     throw new moodle_exception('invalidrequest');
@@ -44,7 +44,7 @@
 
 // Start page output.
 $heading = get_string('gradualreindex', 'search', '');
-$PAGE->set_title($PAGE->title . ': ' . $heading);
+$PAGE->set_title($areaname . ' - ' . get_string('gradualreindex', 'search', ''));
 $PAGE->navbar->add($heading);
 echo $OUTPUT->header();
 echo $OUTPUT->heading($heading);

admin/settings.php

@@ -129,9 +129,7 @@
         $PAGE->set_button($buttons);
     }
 
-    $visiblepathtosection = array_reverse($settingspage->visiblepath);
-
-    $PAGE->set_title("$SITE->shortname: " . implode(": ",$visiblepathtosection));
+    $PAGE->set_title(implode(moodle_page::TITLE_SEPARATOR, $settingspage->visiblepath));
     $PAGE->set_heading($SITE->fullname);
     echo $OUTPUT->header();
 

admin/settings/appearance.php

@@ -244,6 +244,18 @@
 
     // "htmlsettings" settingpage
     $temp = new admin_settingpage('htmlsettings', new lang_string('htmlsettings', 'admin'));
+    $sitenameintitleoptions = [
+        'shortname' => new lang_string('shortname'),
+        'fullname' => new lang_string('fullname'),
+    ];
+    $sitenameintitleconfig = new admin_setting_configselect(
+        'sitenameintitle',
+        new lang_string('sitenameintitle', 'admin'),
+        new lang_string('sitenameintitle_help', 'admin'),
+        'shortname',
+        $sitenameintitleoptions
+    );
+    $temp->add($sitenameintitleconfig);
     $temp->add(new admin_setting_configcheckbox('formatstringstriptags', new lang_string('stripalltitletags', 'admin'), new lang_string('configstripalltitletags', 'admin'), 1));
     $temp->add(new admin_setting_emoticons());
     $ADMIN->add('appearance', $temp);

admin/settings/security.php

@@ -145,7 +145,7 @@
     $temp->add(new admin_setting_heading('adminpresets', new lang_string('siteadminpresetspluginname', 'core_adminpresets'), ''));
     $sensiblesettingsdefault = 'recaptchapublickey@@none, recaptchaprivatekey@@none, googlemapkey3@@none, ';
     $sensiblesettingsdefault .= 'secretphrase@@url, cronremotepassword@@none, smtpuser@@none, ';
-    $sensiblesettingsdefault .= 'smtppass@none, proxypassword@@none, quizpassword@@quiz, allowedip@@none, blockedip@@none, ';
+    $sensiblesettingsdefault .= 'smtppass@@none, proxypassword@@none, quizpassword@@quiz, allowedip@@none, blockedip@@none, ';
     $sensiblesettingsdefault .= 'dbpass@@logstore_database, messageinbound_hostpass@@none, ';
     $sensiblesettingsdefault .= 'bind_pw@@auth_cas, pass@@auth_db, bind_pw@@auth_ldap, ';
     $sensiblesettingsdefault .= 'dbpass@@enrol_database, bind_pw@@enrol_ldap, ';

admin/tool/admin_presets/classes/form/import_form.php

@@ -42,8 +42,8 @@ public function definition(): void {
         $mform->setType('name', PARAM_TEXT);
 
         // File upload.
-        $mform->addElement('filepicker', 'xmlfile',
-            get_string('selectfile', 'tool_admin_presets'));
+        $mform->addElement('filepicker', 'xmlfile', get_string('selectfile', 'tool_admin_presets'), null,
+            ['accepted_types' => ['.xml']]);
         $mform->addRule('xmlfile', null, 'required');
 
         $this->add_action_buttons(true, get_string('import', 'tool_admin_presets'));

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

@@ -100,8 +100,7 @@ Feature: Set up contextual data for tests
     And the following "course enrolments" exist:
       | user | course | role |
       | student1 | C1 | student |
-    When I log in as "student1"
-    And I am on "Course 1" course homepage
+    When I am on the "Course 1" course page logged in as student1
     Then I should see "Topic 1"
 
   Scenario: Add role assigns
@@ -135,17 +134,11 @@ Feature: Set up contextual data for tests
     When I log in as "user1"
     And I am on site homepage
     Then edit mode should be available on the current page
-    And I log out
-    And I log in as "user2"
-    And I am on "Course 1" course homepage
+    And I am on the "Course 1" course page logged in as user2
     Then edit mode should be available on the current page
-    And I log out
-    And I log in as "user3"
-    And I am on "Course 1" course homepage
+    And I am on the "Course 1" course page logged in as user3
     Then edit mode should be available on the current page
-    And I log out
-    And I log in as "user4"
-    And I am on "Course 1" course homepage
+    And I am on the "Course 1" course page logged in as user4
     Then edit mode should be available on the current page
     And I log out
     And I log in as "user5"
@@ -187,8 +180,7 @@ Feature: Set up contextual data for tests
     And the following "activities" exist:
       | activity   | name                            | intro                         | course | idnumber    | grade |
       | assign     | Test assignment name with scale | Test assignment description   | C1     | assign1     | Test Scale 1 |
-    When I log in as "admin"
-    And I am on "Course 1" course homepage
+    When I am on the "Course 1" course page logged in as admin
     Then I should see "Test assignment name"
     # Assignment 2.2 module type is disabled by default
     # And I should see "Test assignment22 name"
@@ -304,9 +296,7 @@ Feature: Set up contextual data for tests
     And the following "grade categories" exist:
       | fullname | course | gradecategory |
       | Grade sub category 2 | C1 | Grade category 1 |
-    When I log in as "admin"
-    And I am on "Course 1" course homepage
-    And I navigate to "View > Grader report" in the course gradebook
+    When I am on the "Course 1" "grades > Grader report > View" page logged in as "admin"
     Then I should see "Grade category 1"
     And I should see "Grade sub category 2"
 
@@ -327,9 +317,7 @@ Feature: Set up contextual data for tests
       | itemname    | course | gradecategory |
       | Test Grade Item 2 | C1 | Grade category 1 |
       | Test Grade Item 3 | C1 | Grade sub category 2 |
-    When I log in as "admin"
-    And I am on "Course 1" course homepage
-    And I navigate to "Setup > Gradebook setup" in the course gradebook
+    When I am on the "Course 1" "grades > gradebook setup" page logged in as "admin"
     Then I should see "Test Grade Item 1"
     And I open the action menu in "Test Grade Item 1" "table_row"
     And I choose "Edit" in the open action menu
@@ -358,9 +346,7 @@ Feature: Set up contextual data for tests
     And the following "scales" exist:
       | name | scale |
       | Test Scale 1 | Disappointing, Good, Very good, Excellent |
-    When I log in as "admin"
-    And I am on "Course 1" course homepage
-    And I navigate to "Scales" in the course gradebook
+    When I am on the "Course 1" "grades > scales" page logged in as admin
     Then I should see "Test Scale 1"
     And I should see "Disappointing,  Good,  Very good,  Excellent"
 
@@ -379,9 +365,7 @@ Feature: Set up contextual data for tests
       | Grade outcome 2 | OT2       | C1     | Test Scale 1 |
     And the following config values are set as admin:
       | enableoutcomes | 1 |
-    When I log in as "admin"
-    And I am on "Course 1" course homepage
-    And I navigate to "More > Outcomes" in the course gradebook
+    When I am on the "Course 1" "grades > outcomes" page logged in as admin
     Then I should see "Grade outcome 1" in the "#addoutcomes" "css_element"
     And I should see "Grade outcome 2" in the "#removeoutcomes" "css_element"
     And I press "Manage outcomes"
@@ -407,9 +391,7 @@ Feature: Set up contextual data for tests
       | Test Outcome Grade Item 1 | C1     | OT1     | Grade category 1 |
     And the following config values are set as admin:
       | enableoutcomes | 1 |
-    When I log in as "admin"
-    And I am on "Course 1" course homepage
-    And I navigate to "Setup > Gradebook setup" in the course gradebook
+    When I am on the "Course 1" "grades > gradebook setup" page logged in as "admin"
     Then I should see "Test Outcome Grade Item 1"
     And I open the action menu in "Test Outcome Grade Item 1" "table_row"
     And I choose "Edit" in the open action menu
@@ -425,6 +407,5 @@ Feature: Set up contextual data for tests
     And the following "blocks" exist:
       | 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
+    When I am on the "Course 1" course page logged in as admin
     Then I should see "Online users"

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

@@ -30,6 +30,12 @@ Feature: Protected data should not be deleted
       | Site purpose | PT1H            | 0          |
       | prot         | P1D             | 1          |
       | unprot       | P1D             | 0          |
+    And the following "mod_forum > discussions" exist:
+      | user     | forum   | name                | message              |
+      | u1       | forump1 | Discussion subject  | Test post in forump1 |
+      | u1       | forumu1 | Discussion subject  | Test post in forumu1 |
+      | u1       | forump2 | Discussion subject  | Test post in forump2 |
+      | u1       | forumu2 | Discussion subject  | Test post in forumu2 |
     And I set the category and purpose for the "forump1" "forum" in course "C1" to "CAT" and "prot"
     And I set the category and purpose for the "forump2" "forum" in course "C2" to "CAT" and "prot"
     And I set the category and purpose for the "forumu1" "forum" in course "C1" to "CAT" and "unprot"
@@ -38,47 +44,25 @@ Feature: Protected data should not be deleted
 
   @javascripta
   Scenario: Unexpired and protected data is not removed
-    Given I log in as "u1"
-    And I am on "C1" course homepage
-    And I add a new discussion to "forump1" forum with:
-      | Subject | Discussion subject |
-      | Message | Test post in forump1 |
-    And I am on "C1" course homepage
-    And I add a new discussion to "forumu1" forum with:
-      | Subject | Discussion subject |
-      | Message | Test post in forumu1 |
-    And I am on "C2" course homepage
-    And I add a new discussion to "forump2" forum with:
-      | Subject | Discussion subject |
-      | Message | Test post in forump2 |
-    And I am on "C2" course homepage
-    And I add a new discussion to "forumu2" forum with:
-      | Subject | Discussion subject |
-      | Message | Test post in forumu2 |
-    And I log out
-    And I log in as "admin"
+    Given  I log in as "admin"
     And I create a dataprivacy "delete" request for "u1"
     And I approve a dataprivacy "delete" request for "u1"
     And I run all adhoc tasks
     And I navigate to "Users > Privacy and policies > Data requests" in site administration
     And I should see "Deleted" in the "u1" "table_row"
 
-    And I am on "C1" course homepage
-    And I follow "forump1"
+    And I am on the "forump1" "forum activity" page
     And I follow "Discussion subject"
     Then I should not see "Test post in forump1"
 
-    When I am on "C1" course homepage
-    And I follow "forumu1"
+    When I am on the "forumu1" "forum activity" page
     And I follow "Discussion subject"
     Then I should not see "Test post in forumu1"
 
-    And I am on "C2" course homepage
-    And I follow "forump2"
+    And I am on the "forump2" "forum activity" page
     And I follow "Discussion subject"
     Then I should see "Test post in forump2"
 
-    When I am on "C2" course homepage
-    And I follow "forumu2"
+    When I am on the "forumu2" "forum activity" page
     And I follow "Discussion subject"
     Then I should not see "Test post in forumu2"

admin/tool/filetypes/delete.php

@@ -46,7 +46,7 @@
 $PAGE->navbar->add($title);
 $PAGE->set_context($context);
 $PAGE->set_pagelayout('admin');
-$PAGE->set_title($SITE->fullname. ': ' . $title);
+$PAGE->set_title($title);
 $PAGE->set_primary_active_tab('siteadminnode');
 $PAGE->set_secondary_active_tab('server');
 

admin/tool/filetypes/edit.php

@@ -107,7 +107,7 @@
 $PAGE->navbar->add($oldextension ? s($oldextension) : $title);
 $PAGE->set_context($context);
 $PAGE->set_pagelayout('admin');
-$PAGE->set_title($SITE->fullname. ': ' . $title);
+$PAGE->set_title($title);
 
 // Display the page.
 echo $OUTPUT->header();

admin/tool/filetypes/index.php

@@ -34,7 +34,7 @@
 $PAGE->set_url(new \moodle_url('/admin/tool/filetypes/index.php'));
 $PAGE->set_context($context);
 $PAGE->set_pagelayout('admin');
-$PAGE->set_title($SITE->fullname. ': ' . $title);
+$PAGE->set_title($title);
 
 $renderer = $PAGE->get_renderer('tool_filetypes');
 

admin/tool/filetypes/revert.php

@@ -46,7 +46,7 @@
 $PAGE->navbar->add($title);
 $PAGE->set_context($context);
 $PAGE->set_pagelayout('admin');
-$PAGE->set_title($SITE->fullname. ': ' . $title);
+$PAGE->set_title($title);
 
 // Display the page.
 echo $OUTPUT->header();

admin/tool/lpimportcsv/export.php

@@ -25,6 +25,8 @@
 require_once(__DIR__ . '/../../../config.php');
 require_once($CFG->libdir.'/adminlib.php');
 
+admin_externalpage_setup('toollpexportcsv');
+
 $pagetitle = get_string('exportnavlink', 'tool_lpimportcsv');
 
 $context = context_system::instance();