MDL-30948 stop messaging suspended and deleted users

lib/messagelib.php

@@ -64,6 +64,9 @@ function message_send($eventdata) {
     if (is_int($eventdata->userfrom)) {
         $eventdata->userfrom = $DB->get_record('user', array('id' => $eventdata->userfrom));
     }
+    if (!isset($eventdata->userto->auth) or !isset($eventdata->userto->suspended) or !isset($eventdata->userto->deleted)) {
+        $eventdata->userto = $DB->get_record('user', array('id' => $eventdata->userto->id));
+    }
 
     //after how long inactive should the user be considered logged off?
     if (isset($CFG->block_online_users_timetosee)) {

lib/moodlelib.php

@@ -4620,7 +4620,7 @@ function email_to_user($user, $from, $subject, $messagetext, $messagehtml='', $a
     }
 
     // skip mail to suspended users
-    if (isset($user->auth) && $user->auth=='nologin') {
+    if ((isset($user->auth) && $user->auth=='nologin') or (isset($user->suspended) && $user->suspended)) {
         return true;
     }
 

message/output/email/message_output_email.php

@@ -46,6 +46,11 @@ function send_message($eventdata) {
             return true;
         }
 
+        // skip any messaging suspended and deleted users
+        if ($eventdata->userto->auth === 'nologin' or $eventdata->userto->suspended or $eventdata->userto->deleted) {
+            return true;
+        }
+
         //the user the email is going to
         $recipient = null;
 

message/output/jabber/message_output_jabber.php

@@ -50,6 +50,11 @@ function send_message($eventdata){
             return true;
         }
 
+        // skip any messaging suspended and deleted users
+        if ($eventdata->userto->auth === 'nologin' or $eventdata->userto->suspended or $eventdata->userto->deleted) {
+            return true;
+        }
+
         //hold onto jabber id preference because /admin/cron.php sends a lot of messages at once
         static $jabberaddresses = array();