diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-12-07 21:01:45 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-12-07 21:01:45 -0600 |
| commit | e74f4ab6e439fe68a565586504d6376abaa4c253 (patch) | |
| tree | 9962dd5c48697d22766638c9a5893d2a382de7de /phpBB/memberlist.php | |
| parent | b3dae8fd61a10d82b5bb8e1626214789d3ac7b5c (diff) | |
| download | forums-e74f4ab6e439fe68a565586504d6376abaa4c253.tar forums-e74f4ab6e439fe68a565586504d6376abaa4c253.tar.gz forums-e74f4ab6e439fe68a565586504d6376abaa4c253.tar.bz2 forums-e74f4ab6e439fe68a565586504d6376abaa4c253.tar.xz forums-e74f4ab6e439fe68a565586504d6376abaa4c253.zip | |
[ticket/8323] Comments
PHPBB3-8323
Diffstat (limited to 'phpBB/memberlist.php')
| -rw-r--r-- | phpBB/memberlist.php | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 1320a2c02e..870598726f 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1719,12 +1719,21 @@ 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 && // They must be a "normal" user - ($data['user_type'] != USER_INACTIVE && $data['user_inactive_reason'] == INACTIVE_MANUAL) && // 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; + // They must be a "normal" user + $data['user_type'] != USER_IGNORE && + + // They must not be deactivated by the administrator + ($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')) && + + // They must not be permanently banned + !sizeof(phpbb_get_banned_user_ids($user_id, false)) && + + // They must allow users to contact via PM + (($auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_')) || $data['user_allow_pm']) + ); // Dump it out to the template $template_data = array( |