2 files changed, 23 insertions, 28 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 561ba19d10..55610a923e 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1828,7 +1828,7 @@ function pm_notification($mode, $author, $recipients, $subject, $message, $msg_i
 		return;
 	}
 
-	// Get permanently banned users (do not allow sending to these users)
+	// Get permanently banned users (do not notify these users)
 	if (!function_exists('phpbb_get_banned_user_ids'))
 	{
 		include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
@@ -1836,12 +1836,18 @@ function pm_notification($mode, $author, $recipients, $subject, $message, $msg_i
 	$banned_users = phpbb_get_banned_user_ids(array_keys($recipients), false);
 	$recipients = array_diff(array_keys($recipients), $banned_users);
 
+	// Get the list of users who can read PMs (only notify those who can read PMs)
+	$can_read = $auth->acl_get_list($recipients, 'u_readpm');
+	$can_read = (empty($can_read) || !isset($can_read[0]['u_readpm'])) ? array() : $can_read[0]['u_readpm'];
+	$recipients = array_intersect($recipients, $can_read);
+
 	if (!sizeof($recipients))
 	{
 		return;
 	}
 
-	$sql = 'SELECT user_id, username, user_email, user_lang, user_notify_pm, user_notify_type, user_jabber
+	// Get the list of users who want to receive notifications, are "normal" and not deactivated, and have a non-blank email address
+	$sql = 'SELECT user_id, username, user_type, user_email, user_lang, user_notify_pm, user_notify_type, user_jabber
 		FROM ' . USERS_TABLE . '
 		WHERE ' . $db->sql_in_set('user_id', $recipients);
 	$result = $db->sql_query($sql);
@@ -1849,7 +1855,7 @@ function pm_notification($mode, $author, $recipients, $subject, $message, $msg_i
 	$msg_list_ary = array();
 	while ($row = $db->sql_fetchrow($result))
 	{
-		if ($row['user_notify_pm'] == 1 && trim($row['user_email']))
+		if ($row['user_notify_pm'] == 1 && $row['user_type'] != USER_IGNORE && $row['user_type'] != USER_INACTIVE && trim($row['user_email']))
 		{
 			$msg_list_ary[] = array(
 				'method'	=> $row['user_notify_type'],
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index e65b523cfb..8fc99818f4 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -1247,40 +1247,29 @@ function handle_message_list_actions(&$address_list, &$error, $remove_u, $remove
 		}
 
 		// Check if users have permission to read PMs
-		// Only check if not a moderator or admin, since they are allowed to override this user setting
-		if (!$auth->acl_gets('a_', 'm_') && !$auth->acl_getf_global('m_'))
+		$can_read = $auth->acl_get_list(array_keys($address_list['u']), 'u_readpm');
+		$can_read = (empty($can_read) || !isset($can_read[0]['u_readpm'])) ? array() : $can_read[0]['u_readpm'];
+		$cannot_read_list = array_diff(array_keys($address_list['u']), $can_read);
+		if (!empty($cannot_read_list))
 		{
-			$can_read = $auth->acl_get_list(false, 'u_readpm');
-			$can_read = (empty($can_read) || !isset($can_read[0]['u_readpm'])) ? array() : $can_read[0]['u_readpm'];
-
-			$cannot_read_list = array_diff(array_keys($address_list['u']), $can_read);
-
-			if (!empty($cannot_read_list))
+			foreach ($cannot_read_list as $cannot_read)
 			{
-				foreach ($cannot_read_list as $cannot_read)
-				{
-					unset($address_list['u'][$cannot_read]);
-				}
-
-				$error[] = $user->lang['PM_USERS_REMOVED_NO_PERMISSION'];
+				unset($address_list['u'][$cannot_read]);
 			}
+
+			$error[] = $user->lang['PM_USERS_REMOVED_NO_PERMISSION'];
 		}
 
 		// Check if users are banned
-		// Only check if not a moderator or admin, since they are allowed to override this user setting
-		if (!$auth->acl_gets('a_', 'm_') && !$auth->acl_getf_global('m_'))
+		$banned_user_list = phpbb_get_banned_user_ids(array_keys($address_list['u']), false);
+		if (!empty($banned_user_list))
 		{
-			$banned_user_list = phpbb_get_banned_user_ids(array_keys($address_list['u']), false);
-
-			if (!empty($banned_user_list))
+			foreach ($banned_user_list as $banned_user)
 			{
-				foreach ($banned_user_list as $banned_user)
-				{
-					unset($address_list['u'][$banned_user]);
-				}
-
-				$error[] = $user->lang['PM_USERS_REMOVED_BANNED'];
+				unset($address_list['u'][$banned_user]);
 			}
+
+			$error[] = $user->lang['PM_USERS_REMOVED_BANNED'];
 		}
 	}
 }