moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 00:16:46 +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?

21
message/output/jabber/message_output_jabber.php
View file

@ -38,21 +38,20 @@ class message_output_jabber extends message_output {
/**
* Processes the message (sends using jabber).
* @param object $message the message to be sent
* @param object $eventdata the event data submitted by the message sender plus $eventdata->savedmessageid
* @return true if ok, false if error
*/
function send_message($message){
global $DB, $CFG;
function send_message($eventdata){
global $CFG;
if (!$userfrom = $DB->get_record('user', array('id' => $message->useridfrom))) {
return false;
}
if (!$userto = $DB->get_record('user', array('id' => $message->useridto))) {
return false;
}
if (!$jabberaddress = get_user_preferences('message_processor_jabber_jabberid', $userto->email, $userto->id)) {
$jabberaddress = $userto->email;
//hold onto jabber id preference because /admin/cron.php sends a lot of messages at once
static $jabberaddresses = array();
if (!array_key_exists($eventdata->userto->id, $jabberaddresses)) {
$jabberaddresses[$eventdata->userto->id] = get_user_preferences('message_processor_jabber_jabberid', $eventdata->userto->email, $eventdata->userto->id);
}
$jabberaddress = $jabberaddresses[$eventdata->userto->id];
$jabbermessage = fullname($userfrom).': '.$message->smallmessage;
$conn = new XMPPHP_XMPP($CFG->jabberhost,$CFG->jabberport,$CFG->jabberusername,$CFG->jabberpassword,'moodle',$CFG->jabberserver);

18
message/output/popup/message_output_popup.php
View file

@ -33,18 +33,24 @@ class message_output_popup extends message_output{
* The popup doesn't send data only saves in the database for later use,
* the popup_interface.php takes the message from the message table into
* the message_read.
* @param object $message the message to be sent
* @param object $eventdata the event data submitted by the message sender plus $eventdata->savedmessageid
* @return true if ok, false if error
*/
public function send_message($message) {
public function send_message($eventdata) {
global $DB;
//hold onto the popup processor id because /admin/cron.php sends a lot of messages at once
static $processorid = null;
//prevent users from getting popup notifications of messages to themselves (happens with forum notifications)
if ($message->useridfrom!=$message->useridto) {
$processor = $DB->get_record('message_processors', array('name'=>'popup'));
if ($eventdata->userfrom->id!=$eventdata->userto->id) {
if (empty($processorid)) {
$processor = $DB->get_record('message_processors', array('name'=>'popup'));
$processorid = $processor->id;
}
$procmessage = new stdClass();
$procmessage->unreadmessageid = $message->id;
$procmessage->processorid = $processor->id;
$procmessage->unreadmessageid = $eventdata->savedmessageid;
$procmessage->processorid = $processorid;
//save this message for later delivery
$DB->insert_record('message_working', $procmessage);