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

message MDL-24873 changes to reduce server load and also get the forum's custom email headers passed through correctly

Browse source
This commit is contained in:
Andrew Davis 2010-10-27 08:47:33 +00:00
parent 9e32912bca
commit fe983847dd
4 changed files with 47 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

19
message/output/email/message_output_email.php
View file

@ -35,23 +35,26 @@ require_once($CFG->dirroot.'/message/output/lib.php');
class message_output_email extends message_output {
/**
* Processes the message (sends by email).
* @param object $message the message to be sent
* @param object $eventdata the event data submitted by the message sender plus $eventdata->savedmessageid
*/
function send_message($message) {
global $DB, $SITE;
function send_message($eventdata) {
global $SITE;
$userto = $DB->get_record('user', array('id' => $message->useridto));
$userfrom = $DB->get_record('user', array('id' => $message->useridfrom));
//hold onto email preference because /admin/cron.php sends a lot of messages at once
static $useremailaddresses = array();
//check user preference for where user wants email sent
$usertoemailaddress = get_user_preferences('message_processor_email_email', '', $message->useridto);
if (!array_key_exists($eventdata->userto->id, $useremailaddresses)) {
$useremailaddresses[$eventdata->userto->id] = get_user_preferences('message_processor_email_email', $eventdata->userto->email, $eventdata->userto->id);
}
$usertoemailaddress = $useremailaddresses[$eventdata->userto->id];
if ( !empty($usertoemailaddress)) {
$userto->email = $usertoemailaddress;
}
$result = email_to_user($userto, $userfrom,
$message->subject, $message->fullmessage, $message->fullmessagehtml);
$result = email_to_user($eventdata->userto, $eventdata->userfrom,
$eventdata->subject, $eventdata->fullmessage, $eventdata->fullmessagehtml);
return $result===true; //email_to_user() can return true, false or "emailstop"
//return true;//do we want to report an error if email sending fails?