makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-19 09:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/8323] Combine into a single query

Browse source 
PHPBB3-8323
This commit is contained in:
Nathaniel Guse 2013-05-01 12:28:31 -05:00
parent d68778e7eb
commit abaa53b0b2
1 changed files with 30 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
phpBB/includes/ucp/ucp_pm_compose.php
View file

@ -1222,49 +1222,47 @@ function handle_message_list_actions(&$address_list, &$error, $remove_u, $remove
// Check for disallowed recipients // Check for disallowed recipients
if (!empty($address_list['u'])) if (!empty($address_list['u']))
{ {
// We need to check their PM status (do they want to receive PM's?) // Administrator deactivated users check and we need to check their
// Only check if not a moderator or admin, since they are allowed to override this user setting // PM status (do they want to receive PM's?)
if (!$auth->acl_gets('a_', 'm_') && !$auth->acl_getf_global('m_')) // Only check PM status if not a moderator or admin, since they
{ // are allowed to override this user setting
$sql = 'SELECT user_id $sql = 'SELECT user_id, user_allow_pm
FROM ' . USERS_TABLE . ' FROM ' . USERS_TABLE . '
WHERE ' . $db->sql_in_set('user_id', array_keys($address_list['u'])) . ' WHERE ' . $db->sql_in_set('user_id', array_keys($address_list['u'])) . '
AND user_allow_pm = 0'; AND (user_type = ' . USER_INACTIVE . '
AND user_inactive_reason = ' . INACTIVE_MANUAL . ')';
if (!$auth->acl_gets('a_', 'm_') && !$auth->acl_getf_global('m_'))
{
$sql .= ' OR user_allow_pm = 0';
}
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$removed = false; $removed_no_pm = $removed_no_permission = false;
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
$removed = true; if (!$auth->acl_gets('a_', 'm_') && !$auth->acl_getf_global('m_') && !$row['user_allow_pm'])
{
$removed_no_pm = true;
}
else
{
$removed_no_permission = true;
}
unset($address_list['u'][$row['user_id']]); unset($address_list['u'][$row['user_id']]);
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
// print a notice about users not being added who do not want to receive pms // print a notice about users not being added who do not want to receive pms
if ($removed) if ($removed_no_pm)
{ {
$error[] = $user->lang['PM_USERS_REMOVED_NO_PM']; $error[] = $user->lang['PM_USERS_REMOVED_NO_PM'];
} }
}
// Administrator deactivated users check
$sql = 'SELECT user_id
FROM ' . USERS_TABLE . '
WHERE ' . $db->sql_in_set('user_id', array_keys($address_list['u'])) . '
AND user_type = ' . USER_INACTIVE . '
AND user_inactive_reason = ' . INACTIVE_MANUAL;
$result = $db->sql_query($sql);
$removed = false;
while ($row = $db->sql_fetchrow($result))
{
$removed = true;
unset($address_list['u'][$row['user_id']]);
}
$db->sql_freeresult($result);
// print a notice about users not being added who do not have permission to receive PMs // print a notice about users not being added who do not have permission to receive PMs
if ($removed) if ($removed_no_permission)
{ {
$error[] = $user->lang['PM_USERS_REMOVED_NO_PERMISSION']; $error[] = $user->lang['PM_USERS_REMOVED_NO_PERMISSION'];
} }