Merge pull request #16 from talview/DEL-2842

Del 2842
talview · Sep 14, 2020 · 667f426 · 667f426
2 parents eafb3d8 + 7991e54
commit 667f426
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/classes/privacy/provider.php b/classes/privacy/provider.php
@@ -227,7 +227,7 @@ public static function delete_data_for_users(approved_userlist $userlist) {
                 $txt .= ", {$userid}";
             }
         }
-        $txt .= ")\nUser Token: {$token}\nSession ID is like ( {$quiz->id}-* )";
+        $txt .= ")\nSession ID is like ( {$quiz->id}-* )";
 
         self::send_mail($to, $reply, $from, $txt);
         $DB->delete_records_select('local_proview', $sql, $params);
@@ -262,7 +262,7 @@ public static function delete_data_for_all_users_in_context(\context $context) {
         $from = self::get_from_user();
 
         $txt = "As per GDPR Compliance, Please Delete the Proview data for all the sessions with\n";
-        $txt = "User Token: {$token}\nSession ID is like ( {$quizid}-* )";
+        $txt .= "Session ID is like ( {$quizid}-* )";
 
         self::send_mail($to, $reply, $from, $txt);
         $DB->delete_records('local_proview', ['quiz_id' => $quizid]);
@@ -300,7 +300,7 @@ public static function delete_data_for_user(approved_contextlist $contextlist) {
         }
 
         $txt = "As per GDPR Compliance, Please Delete the Proview data for the following details\n";
-        $txt = "Profile ID: {$user->id}\nUser Token: {$token}\nSession ID is like ( ";
+        $txt .= "Profile ID: {$user->id}\nSession ID is like ( ";
         foreach ($quizids as $index => $quizid) {
             if ($index === 0) {
                 $txt .= "{$quizid}-*";
@@ -361,7 +361,11 @@ private static function get_from_user() : array {
     private static function send_mail(array $to, array $reply, array $from, string $txt) {
         $sitename = get_site();
         $token = get_config('local_proview', 'token');
-        $subject = "GDPR Request from Moodle | {$sitename->fullname}";
+        $account = get_config('local_proview', 'proview_acc_name');
+        if ($account == '') {
+            $account = $sitename->fullname;
+        }
+        $subject = "GDPR Request from Moodle | {$account}";
 
         $mail = get_mailer();
         $mail->isHTML(false);

diff --git a/lang/en/local_proview.php b/lang/en/local_proview.php
@@ -32,6 +32,8 @@
 $string['token_desc'] = 'For example: U9021015';
 $string['enabled'] = 'Enabled';
 $string['enabled_desc'] = 'Enable Proview for Moodle';
+$string['proview_acc_name'] = 'Proview Account Name';
+$string['proview_acc_name_desc'] = 'Account Name provided by Talview, If not provided use your organisation name.';
 $string['root_dir'] = 'Root Dir';
 $string['root_dir_desc'] = 'Root Dir';
 

diff --git a/settings.php b/settings.php
@@ -55,6 +55,13 @@
     $setting = new admin_setting_configtext($name, $title, $description, $default);
     $settings->add($setting);
 
+    $name = 'local_proview/proview_acc_name';
+    $title = get_string('proview_acc_name', 'local_proview');
+    $description = get_string('proview_acc_name_desc', 'local_proview');
+    $default = '';
+    $setting = new admin_setting_configtext($name, $title, $description, $default);
+    $settings->add($setting);
+
     $name = 'local_proview/root_dir';
     $title = get_string('root_dir', 'local_proview');
     $description = get_string('root_dir_desc', 'local_proview');

diff --git a/version.php b/version.php
@@ -28,8 +28,8 @@
 
 defined('MOODLE_INTERNAL') || die;
 
-$plugin->version  = 2020090101;
+$plugin->version  = 2020091401;
 $plugin->requires = 2018051700;
-$plugin->release = '1.4.1 (Build: 2020090101)';
+$plugin->release = '1.4.2 (Build: 2020091401)';
 $plugin->maturity = MATURITY_STABLE;
 $plugin->component = 'local_proview';