From a4a7fcb93df33c41d1d0faa51e3c322145e97b4e Mon Sep 17 00:00:00 2001 From: Cesar G Date: Fri, 2 May 2014 12:06:00 -0700 Subject: [PATCH 1/2] [ticket/12477] Fix logic to prevent admin-deactivated users from getting PM's. PHPBB3-12477 --- phpBB/memberlist.php | 2 +- phpBB/viewtopic.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 9c6b3d278f..82143d44cb 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1731,7 +1731,7 @@ function show_profile($data, $user_notes_enabled = false, $warn_user_enabled = f $data['user_type'] != USER_IGNORE && // They must not be deactivated by the administrator - ($data['user_type'] != USER_INACTIVE && $data['user_inactive_reason'] == INACTIVE_MANUAL) && + ($data['user_type'] != USER_INACTIVE || $data['user_inactive_reason'] != INACTIVE_MANUAL) && // They must be able to read PMs sizeof($auth->acl_get_list($user_id, 'u_readpm')) && diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 0691355563..c46f30d038 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1609,7 +1609,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) $user_cache[$poster_id]['user_type'] != USER_IGNORE && // They must not be deactivated by the administrator - ($user_cache[$poster_id]['user_type'] != USER_INACTIVE && $user_cache[$poster_id]['user_inactive_reason'] == INACTIVE_MANUAL) && + ($user_cache[$poster_id]['user_type'] != USER_INACTIVE || $user_cache[$poster_id]['user_inactive_reason'] != INACTIVE_MANUAL) && // They must be able to read PMs in_array($poster_id, $can_receive_pm_list) && From 0684d9c6891c38c838b1f169d4a8af40d8e1c810 Mon Sep 17 00:00:00 2001 From: Cesar G Date: Fri, 2 May 2014 12:17:24 -0700 Subject: [PATCH 2/2] [ticket/12477] Tab instead of spaces. PHPBB3-12477 --- phpBB/viewtopic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index c46f30d038..7495e6baee 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1621,7 +1621,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) (($auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_')) || $data['user_allow_pm']) ); - $u_pm = ''; + $u_pm = ''; if ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && $can_receive_pm) {