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

Merge branch 'MDL-26119_message_logging' of git://github.com/andyjdavis/moodle

Browse source
This commit is contained in:
Petr Skoda 2011-02-15 10:39:54 +01:00
commit 64529cb6d2
4 changed files with 31 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/messagelib.php
View file

@ -45,17 +45,17 @@ defined('MOODLE_INTERNAL') || die();
* contexturlname - the display text for contexturl
*
* @param object $eventdata information about the message (component, userfrom, userto, ...)
* @return boolean success
* @return int|false the ID of the new message or false if there was a problem with a processor
*/
function message_send($eventdata) {
global $CFG, $DB;
//new message ID to return
$messageid = false;
//TODO: we need to solve problems with database transactions here somehow, for now we just prevent transactions - sorry
$DB->transactions_forbidden();
//flag we'll return indicating that all processors ran successfully
$success = true;
if (is_int($eventdata->userto)) {
mtrace('message_send() userto is a user ID when it should be a user object');
$eventdata->userto = $DB->get_record('user', array('id' => $eventdata->useridto));
@ -130,10 +130,10 @@ function message_send($eventdata) {
if ($processor=='none' && $savemessage->notification) {
//if they have deselected all processors and its a notification mark it read. The user doesnt want to be bothered
$savemessage->timeread = time();
$DB->insert_record('message_read', $savemessage);
$messageid = $DB->insert_record('message_read', $savemessage);
} else { // Process the message
// Store unread message just in case we can not send it
$savemessage->id = $DB->insert_record('message', $savemessage);
$messageid = $savemessage->id = $DB->insert_record('message', $savemessage);
$eventdata->savedmessageid = $savemessage->id;
// Try to deliver the message to each processor
@ -151,12 +151,12 @@ function message_send($eventdata) {
if (!$pclass->send_message($eventdata)) {
debugging('Error calling message processor '.$procname);
$success = false;
$messageid = false;
}
}
} else {
debugging('Error finding message processor '.$procname);
$success = false;
$messageid = false;
}
}
@ -165,16 +165,16 @@ function message_send($eventdata) {
//unread. To prevent this mark the message read if messaging is disabled
if (empty($CFG->messaging)) {
require_once($CFG->dirroot.'/message/lib.php');
message_mark_message_read($savemessage, time());
$messageid = message_mark_message_read($savemessage, time());
} else if ( $DB->count_records('message_working', array('unreadmessageid' => $savemessage->id)) == 0){
//if there is no more processors that want to process this we can move message to message_read
require_once($CFG->dirroot.'/message/lib.php');
message_mark_message_read($savemessage, time(), true);
$messageid = message_mark_message_read($savemessage, time(), true);
}
}
}
return $success;
return $messageid;
}