From 6983f380c55779054b545e4760bf250e8ecace2e Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 8 Sep 2012 17:48:13 -0500
Subject: [ticket/11103] Full url function

PHPBB3-11103
---
 phpBB/includes/notifications/method/email.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes/notifications/method')

diff --git a/phpBB/includes/notifications/method/email.php b/phpBB/includes/notifications/method/email.php
index 0120485cff..b1979296b9 100644
--- a/phpBB/includes/notifications/method/email.php
+++ b/phpBB/includes/notifications/method/email.php
@@ -23,6 +23,10 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notifications_method_email extends phpbb_notifications_method_base
 {
+	/**
+	* Is this method available for the user?
+	* This is checked on the notifications options
+	*/
 	public static function is_available()
 	{
 		// Email is always available
@@ -77,12 +81,9 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base
 			$messenger->to($user['user_email'], $user['username']);
 
 			$messenger->assign_vars(array(
-				'SUBJECT'		=> htmlspecialchars_decode($notification->get_title()),
-				'AUTHOR_NAME'	=> '',
-				'USERNAME'		=> htmlspecialchars_decode($user['username']),
+				'SUBJECT'			=> htmlspecialchars_decode($notification->get_title()),
 
-				'U_INBOX'			=> $board_url . "/ucp.{$this->php_ext}?i=pm&folder=inbox",
-				'U_VIEW_MESSAGE'	=> $board_url . "/ucp.{$this->php_ext}?i=pm&mode=view&p={$notification->item_id}",
+				'U_VIEW_MESSAGE'	=> $notification->get_full_url(),
 			));
 
 			$messenger->send('email');
-- 
cgit v1.2.1


From 98a03090a05b1d7651c05ad23802973cf20dcf6b Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 8 Sep 2012 21:05:49 -0500
Subject: [ticket/11103] Move banned user checking to email method

This will make sure banned users are never sent notification emails

PHPBB3-11103
---
 phpBB/includes/notifications/method/email.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'phpBB/includes/notifications/method')

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);
-- 
cgit v1.2.1