mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-22 08:13:14 +02:00
Code Issues Releases Wiki Activity

[ticket/8323] Correct PM notification settings (only notify those who can receive them)

Browse Source 
Also correcting the way it was setup for users to be able to receive PMs (do not allow administrators/moderators to send to banned, inactive, or non-standard users, that just doesn't make sense)

PHPBB3-8323
This commit is contained in:
Nathan
2012-07-10 16:07:12 -05:00
parent 07b9c1e2fd
commit 33852e6251
4 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/memberlist.php
View File

@@ -1696,7 +1696,13 @@ function show_profile($data, $user_notes_enabled = false, $warn_user_enabled = f
}
// Can this user receive a Private Message?
$can_receive_pm = ($data['user_type'] <> USER_IGNORE && $data['user_type'] <> USER_INACTIVE && (($auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_')) || ($data['user_allow_pm'] && sizeof($auth->acl_get_list($user_id, 'u_readpm')) && !sizeof(phpbb_get_banned_user_ids($user_id, false))))) ? true : false;
$can_receive_pm = (
$data['user_type'] != USER_IGNORE && // They must be a "normal" user
$data['user_type'] != USER_INACTIVE && // They must not be deactivated by the administrator
sizeof($auth->acl_get_list($user_id, 'u_readpm')) && // They must be able to read PMs
!sizeof(phpbb_get_banned_user_ids($user_id, false)) && // They must not be permanently banned
(($auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_')) || $data['user_allow_pm']) // They must allow users to contact via PM
) ? true : false;
// Dump it out to the template
return array(