MDL-30948 stop messaging suspended and deleted users

2011-12-29 17:01:10 +01:00
parent 2117dcb591
commit ca8fe0b00a
4 changed files with 14 additions and 1 deletions
@@ -46,6 +46,11 @@ class message_output_email extends message_output {
            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;

@@ -50,6 +50,11 @@ class message_output_jabber extends message_output {
            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();