message MDL-23098 fixed the eratic behaviour of new message notifications

diff --git a/lib/messagelib.php b/lib/messagelib.php
index 9163729..d16a1f3 100644 (file)
--- a/lib/messagelib.php
+++ b/lib/messagelib.php
@@ -50,20 +50,21 @@ function message_send($eventdata) {
     //TODO: we need to solve problems with database transactions here somehow, for now we just prevent transactions - sorry
     $DB->transactions_forbidden();
 
+    //after how long inactive should the user be considered logged off?
     if (isset($CFG->block_online_users_timetosee)) {
         $timetoshowusers = $CFG->block_online_users_timetosee * 60;
     } else {
-        $timetoshowusers = 300;
+        $timetoshowusers = 300;//5 minutes
     }
 
-/// Work out if the user is logged in or not
-    if ((time() - $eventdata->userto->lastaccess) > $timetoshowusers) {
-        $userstate = 'loggedoff';
-    } else {
+    // Work out if the user is logged in or not
+    if ((time() - $timetoshowusers) < $eventdata->userto->lastaccess) {
         $userstate = 'loggedin';
+    } else {
+        $userstate = 'loggedoff';
     }
 
-/// Create the message object
+    // Create the message object
     $savemessage = new object();
     $savemessage->useridfrom        = $eventdata->userfrom->id;
     $savemessage->useridto          = $eventdata->userto->id;
@@ -74,9 +75,10 @@ function message_send($eventdata) {
     $savemessage->smallmessage      = $eventdata->smallmessage;
     $savemessage->timecreated       = time();
 
-/// Find out what processors are defined currently
-/// When a user doesn't have settings none gets return, if he doesn't want contact "" gets returned
-    $processor = get_user_preferences('message_provider_'.$eventdata->component.'_'.$eventdata->name.'_'.$userstate, NULL, $eventdata->userto->id);
+    // Find out what processors are defined currently
+    // When a user doesn't have settings none gets return, if he doesn't want contact "" gets returned
+    $preferencename = 'message_provider_'.$eventdata->component.'_'.$eventdata->name.'_'.$userstate;
+    $processor = get_user_preferences($preferencename, NULL, $eventdata->userto->id);
 
     if ($processor == NULL) { //this user never had a preference, save default
         if (!message_set_default_message_preferences($eventdata->userto)) {
@@ -124,6 +126,17 @@ function message_send($eventdata) {
                 return false;
             }
         }
+
+            $savemessage->timeread = time();
+            $messageid = $savemessage->id;
+            unset($savemessage->id);
+
+            //if there is no more processors that want to process this we can move message to message_read
+            if ( $DB->count_records('message_working', array('unreadmessageid' => $messageid)) == 0){
+                if ($DB->insert_record('message_read', $savemessage)) {
+                    $DB->delete_records('message', array('id' => $messageid));
+                }
+            }
     }
 
     return true;

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 939fd47..31e7f79 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -2256,8 +2256,10 @@ function require_login($courseorid = NULL, $autologinguest = true, $cm = NULL, $
     // Make sure the USER has a sesskey set up. Used for CSRF protection.
     sesskey();
 
-    // Do not bother admins with any formalities, no last access updates either
+    // Do not bother admins with any formalities
     if (is_siteadmin()) {
+        //set accesstime or the user will appear offline which messes up messaging
+        user_accesstime_log($course->id);
         return;
     }
 

diff --git a/message/lib.php b/message/lib.php
index 95745d9..a4973e6 100644 (file)
--- a/message/lib.php
+++ b/message/lib.php
@@ -1491,7 +1491,7 @@ function message_post_message($userfrom, $userto, $message, $format, $messagetyp
     global $CFG, $SITE, $USER, $DB;
 
     $eventdata = new object();
-    $eventdata->component        = 'message';
+    $eventdata->component        = 'moodle';
     $eventdata->name             = 'instantmessage';
     $eventdata->userfrom         = $userfrom;
     $eventdata->userto           = $userto;
@@ -1665,20 +1665,24 @@ function message_get_popup_messages($destuserid, $fromuserid=NULL){
     return $messages;
 }
 
-//marks all messages being sent from $fromuserid to $destuserid as read
-function message_mark_messages_read($destuserid, $fromuserid){
+//marks ALL messages being sent from $fromuserid to $touserid as read
+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';
-    $messages = $DB->get_recordset_sql($sql, array('useridto'=>$destuserid,'useridfrom'=>$fromuserid));
+    $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
 
-        //delete what we've processed and check if can move message
+        //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){
             if ($DB->insert_record('message_read', $message)) {
                 $DB->delete_records('message', array('id' => $messageid));

diff --git a/message/output/email/message_output_email.php b/message/output/email/message_output_email.php
index 941be9b..72fc60b 100644 (file)
--- a/message/output/email/message_output_email.php
+++ b/message/output/email/message_output_email.php
@@ -51,32 +51,12 @@ class message_output_email extends message_output {
             $usertoemail = $userto->email;
         }
         $userfrom = $DB->get_record('user', array('id' => $message->useridfrom));
-        if ( email_to_user($usertoemail, $userfrom->email,
+        $result = email_to_user($usertoemail, $userfrom->email,
             $message->subject, $message->fullmessage,
-            $message->fullmessagehtml)
-        ){
-            /// Move the entry to the other table
-            $message->timeread = time();
-            $messageid = $message->id;
-            unset($message->id);
+            $message->fullmessagehtml);
 
-            //if there is no more processor that want to process this can move message
-            if ( $DB->count_records('message_working', array('unreadmessageid' => $messageid)) == 0){
-                if ($DB->insert_record('message_read', $message)) {
-                    $DB->delete_records('message', array('id' => $messageid));
-                }
-            }
-        }else{
-            //delete what we've processed and check if can move message
-            $messageid = $message->id;
-            unset($message->id);
-            if ( $DB->count_records('message_working', array('unreadmessageid' => $messageid)) == 0){
-                if ($DB->insert_record('message_read', $message)) {
-                    $DB->delete_records('message', array('id' => $messageid));
-                }
-            }
-        }
-        return true;
+        //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?
     }
 
     /**