moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-47162 core_message: Add course id to message eventdata

Browse source
This commit is contained in:
Amanda Doughty 2016-07-20 12:40:34 +01:00 • committed by Eloy Lafuente (stronk7)
parent 577bd70d38
commit cc350fd9c8
34 changed files with 345 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

24
mod/feedback/lib.php
View file

@ -3027,7 +3027,8 @@ function feedback_send_email($cm, $feedback, $course, $user) {
}
if ($feedback->anonymous == FEEDBACK_ANONYMOUS_NO) {
$eventdata = new stdClass();
$eventdata = new \core\message\message();
$eventdata->courseid = $course->id;
$eventdata->name = 'submission';
$eventdata->component = 'mod_feedback';
$eventdata->userfrom = $user;
@ -3036,10 +3037,14 @@ function feedback_send_email($cm, $feedback, $course, $user) {
$eventdata->fullmessage = $posttext;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = $posthtml;
$eventdata->smallmessage = '';
$eventdata->smallmessage = $postsubject;
$eventdata->courseid = $course->id;
$eventdata->contexturl = $info->url;
$eventdata->contexturlname = $info->feedback;
message_send($eventdata);
} else {
$eventdata = new stdClass();
$eventdata = new \core\message\message();
$eventdata->courseid = $course->id;
$eventdata->name = 'submission';
$eventdata->component = 'mod_feedback';
$eventdata->userfrom = $teacher;
@ -3048,7 +3053,10 @@ function feedback_send_email($cm, $feedback, $course, $user) {
$eventdata->fullmessage = $posttext;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = $posthtml;
$eventdata->smallmessage = '';
$eventdata->smallmessage = $postsubject;
$eventdata->courseid = $course->id;
$eventdata->contexturl = $info->url;
$eventdata->contexturlname = $info->feedback;
message_send($eventdata);
}
}
@ -3097,7 +3105,8 @@ function feedback_send_email_anonym($cm, $feedback, $course) {
$posthtml = '';
}
$eventdata = new stdClass();
$eventdata = new \core\message\message();
$eventdata->courseid = $course->id;
$eventdata->name = 'submission';
$eventdata->component = 'mod_feedback';
$eventdata->userfrom = $teacher;
@ -3106,7 +3115,10 @@ function feedback_send_email_anonym($cm, $feedback, $course) {
$eventdata->fullmessage = $posttext;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = $posthtml;
$eventdata->smallmessage = '';
$eventdata->smallmessage = $postsubject;
$eventdata->courseid = $course->id;
$eventdata->contexturl = $info->url;
$eventdata->contexturlname = $info->feedback;
message_send($eventdata);
}
}

8
mod/feedback/show_nonrespondents.php
View file

@ -97,7 +97,8 @@ if ($action == 'sendmessage' AND has_capability('moodle/course:bulkmessaging', $
if (is_array($messageuser)) {
foreach ($messageuser as $userid) {
$senduser = $DB->get_record('user', array('id'=>$userid));
$eventdata = new stdClass();
$eventdata = new \core\message\message();
$eventdata->courseid = $course->id;
$eventdata->name = 'message';
$eventdata->component = 'mod_feedback';
$eventdata->userfrom = $USER;
@ -106,7 +107,10 @@ if ($action == 'sendmessage' AND has_capability('moodle/course:bulkmessaging', $
$eventdata->fullmessage = html_to_text($htmlmessage);
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = $htmlmessage;
$eventdata->smallmessage = '';
$eventdata->smallmessage = $subject;
$eventdata->courseid = $course->id;
$eventdata->contexturl = $link3;
$eventdata->contexturlname = $feedback->name;
$good = $good && message_send($eventdata);
}
if (!empty($good)) {