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

message MDLSITE-1042 fixed some messaging bugs

Browse Source
This commit is contained in:
Andrew Davis
2010-10-07 03:59:07 +00:00
parent 8d873bdc16
commit ee7cd81a1c
1 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
message/lib.php
+33 -24
View File
@@ -1635,12 +1635,7 @@ function message_move_userfrom_unread2read($userid) {
// move all unread messages from message table to message_read
if ($messages = $DB->get_records_select('message', 'useridfrom = ?', array($userid), 'timecreated')) {
foreach ($messages as $message) {
$message->timeread = 0; //the message was never read
$messageid = $message->id;
unset($message->id);
$DB->insert_record('message_read', $message);
$DB->delete_records('message', array('id' => $messageid));
$DB->delete_records('message_working', array('unreadmessageid' => $messageid));
message_mark_message_read($message, 0); //set timeread to 0 as the message was never read
}
}
return true;
@@ -1670,35 +1665,49 @@ function message_get_popup_messages($destuserid, $fromuserid=NULL){
//delete what we've processed and check if can move message
$DB->delete_records('message_working', array('id' => $msgp->id));
if ( $DB->count_records('message_working', array('unreadmessageid'=>$messageid)) == 0){
$DB->insert_record('message_read', $message);
$DB->delete_records('message', array('id' => $messageid));
message_mark_message_read($message, time(), true);
}
}
}
return $messages;
}
//marks ALL messages being sent from $fromuserid to $touserid as read
/**
* marks ALL messages being sent from $fromuserid to $touserid as read
* @param int $touserid the id of the message recipient
* @param int $fromuserid the id of the message sender
* @return void
*/
function message_mark_messages_read($touserid, $fromuserid){
global $DB;
$sql = 'SELECT m.*, mw.id AS mwid FROM {message} m JOIN {message_working} mw ON m.id=mw.unreadmessageid WHERE m.useridto=:useridto AND m.useridfrom=:useridfrom';
$sql = 'SELECT m.* FROM {message} m WHERE m.useridto=:useridto AND m.useridfrom=:useridfrom';
$messages = $DB->get_recordset_sql($sql, array('useridto'=>$touserid,'useridfrom'=>$fromuserid));
//todo surely we can do this with one query rather than with a loop
foreach ($messages as $message) {
$message->timeread = time();
$messageid = $message->id;
unset($message->id);//unset because it will get a new id on insert into message_read
//indicate the message is read
$DB->delete_records('message_working', array('id' => $message->mwid));
//have all message processors completed dealing with this message?
if ( $DB->count_records('message_working', array('unreadmessageid'=>$messageid)) == 0){
$DB->insert_record('message_read', $message);
$DB->delete_records('message', array('id' => $messageid));
}
message_mark_message_read($message, time());
}
}
/**
* Mark a single message as read
* @param message an object with an object property ie $message->id which is an id in the message table
* @param int $timeread the timestamp for when the message should be marked read. Usually time().
* @param bool $messageworkingempty Is the message_working table already confirmed empty for this message?
* @return void
*/
function message_mark_message_read($message, $timeread, $messageworkingempty=false) {
global $DB;
$message->timeread = $timeread;
$messageid = $message->id;
unset($message->id);//unset because it will get a new id on insert into message_read
//If any processors have pending actions abort them
if (!$messageworkingempty) {
$DB->delete_records('message_working', array('unreadmessageid' => $messageid));
}
$DB->insert_record('message_read', $message);
$DB->delete_records('message', array('id' => $messageid));
}