L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-47162 core_message: Updating all uses of messaging to add courseid

Browse Source
This commit is contained in:
Eric Merrill
2016-10-31 14:13:13 -04:00
parent a29bcf7819
commit 880fc15bf0
18 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/messageinbound/classes/manager.php
+3
View File
@@ -930,6 +930,7 @@ class manager {
$userfrom->customheaders[] = 'In-Reply-To: ' . $messageid;
// The message will be sent from the intended user.
$eventdata->courseid = SITEID;
$eventdata->userfrom = \core_user::get_support_user();
$eventdata->userto = $USER;
$eventdata->subject = $this->get_reply_subject($this->currentmessagedata->envelope->subject);
@@ -971,6 +972,7 @@ class manager {
$messagedata->error = $error;
$eventdata = new \core\message\message();
$eventdata->courseid = SITEID;
$eventdata->component = 'tool_messageinbound';
$eventdata->name = 'messageprocessingerror';
$eventdata->userfrom = $userfrom;
@@ -1030,6 +1032,7 @@ class manager {
$messagedata->subject = $this->currentmessagedata->envelope->subject;
$eventdata = new \core\message\message();
$eventdata->courseid = SITEID;
$eventdata->component = 'tool_messageinbound';
$eventdata->name = 'messageprocessingsuccess';
$eventdata->userfrom = $userfrom;
admin/tool/monitor/classes/notification_task.php
+1
View File
@@ -84,6 +84,7 @@ class notification_task extends \core\task\adhoc_task {
$template = $this->replace_placeholders($template, $subscription, $eventobj, $context);
$htmlmessage = format_text($template, $subscription->templateformat, array('context' => $context));
$msgdata = new \core\message\message();
$msgdata->courseid = empty($subscription->courseid) ? SITEID : $subscription->courseid;
$msgdata->component = 'tool_monitor'; // Your component name.
$msgdata->name = 'notification'; // This is the message name from messages.php.
$msgdata->userfrom = \core_user::get_noreply_user();