mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 04:30:15 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-63009-master' of git://github.com/mickhawkins/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2018-09-17 23:30:13 +02:00
commit 4ab33be074
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/tool/dataprivacy/classes/api.php
View File

@ -634,6 +634,8 @@ class api {
'requestedby' => $requestedby->fullname,
'requesttype' => $typetext,
'requestdate' => userdate($requestdata->timecreated),
'requestorigin' => $SITE->fullname,
'requestoriginurl' => new moodle_url('/'),
'requestcomments' => $requestdata->messagehtml,
'datarequestsurl' => $datarequestsurl
];

1
admin/tool/dataprivacy/lang/en/tool_dataprivacy.php
View File

@ -226,6 +226,7 @@ $string['requestdenied'] = 'The request has been denied';
$string['requestemailintro'] = 'You have received a data request:';
$string['requestfor'] = 'Requesting for';
$string['requestmarkedcomplete'] = 'The request has been marked as complete';
$string['requestorigin'] = 'Request origin';
$string['requeststatus'] = 'Status';
$string['requestsubmitted'] = 'Your request has been submitted to the privacy officer';
$string['requesttype'] = 'Type';

12
admin/tool/dataprivacy/templates/data_request_email.mustache
View File

@ -31,6 +31,8 @@
* string requestedby The one making the request.
* string requesttype The request type.
* string requestdate The date the request was made.
* string requestorigin The name of the site the request originates from.
* string requestoriginurl The homepage of the site the request originates from.
* string requestcomments Additional details regarding the request.
* bool forself Whether the request has been made on behalf of another user or not.
* string datarequestsurl The URL to the data requests page.
@ -42,6 +44,8 @@
"requestedby": "Angus Zhang",
"requesttype": "Export user data",
"requestdate": "31 January 2018",
"requestorigin": "My Amazing Site",
"requestoriginurl": "https://www.bestmoodlesiteever.com",
"requestcomments": "Dear admin,<br/> I would like to request a copy of my son's user data. Thanks!",
"forself": true,
"datarequestsurl": "#"
@ -90,6 +94,14 @@
</td>
</tr>
{{/forself}}
<tr>
<th scope="row">
{{#str}}requestorigin, tool_dataprivacy{{/str}}
</th>
<td>
<a href="{{requestoriginurl}}">{{{requestorigin}}}</a>
</td>
</tr>
<tr>
<th scope="row">
{{#str}}requestcomments, tool_dataprivacy{{/str}}