diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-09-08 21:05:49 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-09-08 21:05:49 -0500 |
| commit | 98a03090a05b1d7651c05ad23802973cf20dcf6b (patch) | |
| tree | 6dd5fa0febf60f7c50e987bad282d8b89632ddca /phpBB/includes/notifications/method/email.php | |
| parent | 6983f380c55779054b545e4760bf250e8ecace2e (diff) | |
| download | forums-98a03090a05b1d7651c05ad23802973cf20dcf6b.tar forums-98a03090a05b1d7651c05ad23802973cf20dcf6b.tar.gz forums-98a03090a05b1d7651c05ad23802973cf20dcf6b.tar.bz2 forums-98a03090a05b1d7651c05ad23802973cf20dcf6b.tar.xz forums-98a03090a05b1d7651c05ad23802973cf20dcf6b.zip | |
[ticket/11103] Move banned user checking to email method
This will make sure banned users are never sent notification emails
PHPBB3-11103
Diffstat (limited to 'phpBB/includes/notifications/method/email.php')
| -rw-r--r-- | phpBB/includes/notifications/method/email.php | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/phpBB/includes/notifications/method/email.php b/phpBB/includes/notifications/method/email.php index b1979296b9..2b80b5bf3a 100644 --- a/phpBB/includes/notifications/method/email.php +++ b/phpBB/includes/notifications/method/email.php @@ -52,6 +52,13 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base $user_ids[] = $notification->user_id; } + // We do not send emails to banned users + if (!function_exists('phpbb_get_banned_user_ids')) + { + include($phpbb_container->getParameter('core.root_path') . 'includes/functions_user.' . $phpbb_container->getParameter('core.php_ext')); + } + $banned_users = phpbb_get_banned_user_ids($user_ids); + $sql = 'SELECT * FROM ' . USERS_TABLE . ' WHERE ' . $this->db->sql_in_set('user_id', $user_ids); $result = $this->db->sql_query($sql); @@ -72,6 +79,11 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base // Time to go through the queue and send emails foreach ($this->queue as $notification) { + if (in_array($notification->user_id, $banned_users)) + { + continue; + } + $notification->users($users); $user = $notification->get_user($notification->user_id); |