Merge branch 'MDL-74189-39' of https://github.com/mihailges/moodle in…

…to MOODLE_39_STABLE

admin/tool/moodlenet/classes/task/send_mnet_profiles_data_removed_notification.php

@@ -0,0 +1,45 @@
+<?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/>.
+
+declare(strict_types=1);
+
+namespace tool_moodlenet\task;
+
+use core\message\message;
+
+/**
+ * Ad-hoc task to send a notification to admin stating that the user data related to the linked MoodleNet profiles has
+ * been removed.
+ *
+ * @package   tool_moodlenet
+ * @copyright 2022 Mihail Geshoski <mihail@moodle.com>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class send_mnet_profiles_data_removed_notification extends \core\task\adhoc_task {
+    public function execute(): void {
+        $message = new message();
+        $message->component = 'moodle';
+        $message->name = 'notices';
+        $message->userfrom = \core_user::get_noreply_user();
+        $message->userto = get_admin();
+        $message->notification = 1;
+        $message->subject = get_string('removedmnetprofilenotification_subject', 'tool_moodlenet');
+        $message->fullmessageformat = FORMAT_HTML;
+        $message->fullmessagehtml = get_string('removedmnetprofilenotification', 'tool_moodlenet');
+        $message->smallmessage = strip_tags($message->fullmessagehtml);
+        message_send($message);
+    }
+}

admin/tool/moodlenet/db/upgrade.php

@@ -123,5 +123,24 @@ function xmldb_tool_moodlenet_upgrade(int $oldversion) {
         upgrade_plugin_savepoint(true, 2020061503, 'tool', 'moodlenet');
     }
 
+    if ($oldversion < 2020061504) {
+
+        $selectsql = "moodlenetprofile IS NOT NULL AND moodlenetprofile != ''";
+
+        // If there are any users with MoodleNet profile set.
+        if ($DB->count_records_select('user', $selectsql)) {
+            // Remove the value set for the MoodleNet profile as this format can no longer be used to authenticate
+            // MoodleNet users.
+            $DB->set_field_select('user', 'moodlenetprofile', '', $selectsql);
+
+            // Use an adhoc task to send a notification to admin stating that the user data related to the linked
+            // MoodleNet profiles has been removed.
+            $notificationtask = new tool_moodlenet\task\send_mnet_profiles_data_removed_notification();
+            core\task\manager::queue_adhoc_task($notificationtask);
+        }
+
+        upgrade_plugin_savepoint(true, 2020061504, 'tool', 'moodlenet');
+    }
+
     return true;
 }

admin/tool/moodlenet/lang/en/tool_moodlenet.php

@@ -26,7 +26,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 $string['addingaresource'] = 'Adding content from MoodleNet';
-$string['aria:enterprofile'] = "Enter your MoodleNet profile URL";
+$string['aria:enterprofile'] = "Enter your MoodleNet profile ID";
 $string['aria:footermessage'] = "Browse for content on MoodleNet";
 $string['browsecontentmoodlenet'] = "Or browse for content on MoodleNet";
 $string['clearsearch'] = "Clear search";
@@ -39,11 +39,11 @@
 $string['enablemoodlenet'] = 'Enable MoodleNet integration';
 $string['enablemoodlenet_desc'] = 'If enabled, a user with the capability to create and manage activities can browse MoodleNet via the activity chooser and import MoodleNet resources into their course. In addition, a user with the capability to restore backups can select a backup file on MoodleNet and restore it into Moodle.';
 $string['errorduringdownload'] = 'An error occurred while downloading the file: {$a}';
-$string['forminfo'] = 'Your MoodleNet profile will be automatically saved in your profile on this site.';
+$string['forminfo'] = 'Your MoodleNet profile ID will be automatically saved in your profile on this site.';
 $string['footermessage'] = "Or browse for content on";
 $string['instancedescription'] = "MoodleNet is an open social media platform for educators, with a focus on the collaborative curation of collections of open resources. ";
-$string['instanceplaceholder'] = '@yourprofile@moodle.net';
-$string['inputhelp'] = 'Or if you have a MoodleNet account already, enter your MoodleNet profile:';
+$string['instanceplaceholder'] = 'a1b2c3d4e5f6-example@moodle.net';
+$string['inputhelp'] = 'Or if you have a MoodleNet account already, copy the ID from your MoodleNet profile and paste it here:';
 $string['invalidmoodlenetprofile'] = '$userprofile is not correctly formatted';
 $string['importconfirm'] = 'You are about to import the content "{$a->resourcename} ({$a->resourcetype})" into the course "{$a->coursename}". Are you sure you want to continue?';
 $string['importconfirmnocourse'] = 'You are about to import the content "{$a->resourcename} ({$a->resourcetype})" into your site. Are you sure you want to continue?';
@@ -56,12 +56,15 @@
 $string['moodlenetsettings'] = 'MoodleNet settings';
 $string['moodlenetnotenabled'] = 'The MoodleNet integration must be enabled in Site administration / MoodleNet before resource imports can be processed.';
 $string['notification'] = 'You are about to import the content "{$a->name} ({$a->type})" into your site. Select the course in which it should be added, or <a href="{$a->cancellink}">cancel</a>.';
+$string['removedmnetprofilenotification'] = '<p>Due to some recent changes on the MoodleNet platform, users that have previously saved their MoodleNet profile on the site can no longer use this data to authenticate on the MoodleNet platform. The related data has now been removed as it is no longer useful.</p>
+<p>The users will need to reset this information on the site by linking their MoodleNet profile ID which can be found on their MoodleNet profile.</p>';
+$string['removedmnetprofilenotification_subject'] = 'Linked MoodleNet profiles removed.';
 $string['searchcourses'] = "Search courses";
 $string['selectpagetitle'] = 'Select page';
 $string['pluginname'] = 'MoodleNet';
 $string['privacy:metadata'] = "The MoodleNet tool only facilitates communication with MoodleNet. It stores no data.";
-$string['profilevalidationerror'] = 'There was a problem trying to validate your profile';
-$string['profilevalidationfail'] = 'Please enter a valid MoodleNet profile';
+$string['profilevalidationerror'] = 'There was a problem trying to validate your MoodleNet profile ID';
+$string['profilevalidationfail'] = 'Please enter a valid MoodleNet profile ID';
 $string['profilevalidationpass'] = 'Looks good!';
 $string['saveandgo'] = "Save and go";
 $string['uploadlimitexceeded'] = 'The file size {$a->filesize} exceeds the user upload limit of {$a->uploadlimit} bytes.';

admin/tool/moodlenet/version.php

@@ -25,6 +25,6 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component  = 'tool_moodlenet';
-$plugin->version    = 2020061503;
+$plugin->version    = 2020061504;
 $plugin->requires   = 2020060900;
 $plugin->maturity   = MATURITY_ALPHA;

lang/en/user.php

@@ -36,8 +36,8 @@
 $string['filtertype'] = 'Filter type';
 $string['match'] = 'Match';
 $string['matchofthefollowing'] = 'of the following:';
-$string['moodlenetprofile'] = 'MoodleNet profile';
-$string['moodlenetprofile_help'] = 'This field is to link your MoodleNet profile to Moodle. It expects a WebFinger compliant URI';
+$string['moodlenetprofile'] = 'MoodleNet profile ID';
+$string['moodlenetprofile_help'] = 'This field represents your MoodleNet profile ID which is used to link your MoodleNet profile to Moodle. It expects a WebFinger-compliant URI.';
 $string['placeholdertypeorselect'] = 'Type or select...';
 $string['placeholdertype'] = 'Type...';
 $string['privacy:courserequestpath'] = 'Requested courses';