mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-16 14:02:32 +02:00
Code Issues Projects Releases Wiki Activity

MDL-30948 stop messaging suspended and deleted users

Browse Source
This commit is contained in:
Petr Skoda 2011-12-29 16:47:40 +01:00
parent 2117dcb591
commit ca8fe0b00a
4 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/messagelib.php
View File

@ -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)) {

2
lib/moodlelib.php
View File

@ -5008,7 +5008,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;
}

5
message/output/email/message_output_email.php
View File

@ -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;

5
message/output/jabber/message_output_jabber.php
View File

@ -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();