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

[ticket/11507] Allow group & unapproved post count options to be used alone.

Browse Source 
PHPBB3-11507
This commit is contained in:
Cesar G
2013-11-27 20:59:45 -08:00
parent c5656747d8
commit ef2e5ca966
1 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
phpBB/includes/acp/acp_prune.php
View File

@@ -450,8 +450,8 @@ class acp_prune
}
}
// Protect the admin, do not prune if no options are given...
if (!$where_sql)
// If no search criteria were provided, go no further.
if (!$where_sql && !$group_id && $posts_on_queue === false)
{
return;
}
@@ -468,6 +468,9 @@ class acp_prune
}
$db->sql_freeresult($result);
// Protect the admin, do not prune if no options are given...
if ($where_sql)
{
// Do not prune founder members
$sql = 'SELECT user_id, username
FROM ' . USERS_TABLE . '
@@ -488,12 +491,15 @@ class acp_prune
}
}
$db->sql_freeresult($result);
}
if ($group_id)
{
$sql = 'SELECT u.user_id, u.username
FROM ' . USER_GROUP_TABLE . ' ug, ' . USERS_TABLE . ' u
WHERE ug.group_id = ' . (int) $group_id . '
AND ug.user_id <> ' . ANONYMOUS . '
AND u.user_type <> ' . USER_FOUNDER . '
AND ug.user_pending = 0
AND ' . $db->sql_in_set('ug.user_id', $user_ids, false, true) . '
AND u.user_id = ug.user_id';
@@ -504,10 +510,14 @@ class acp_prune
// previous query)
$user_ids = $usernames = array();
while ($row = $db->sql_fetchrow($result))
{
// Do not prune bots and the user currently pruning.
if ($row['user_id'] != $user->data['user_id'] && !in_array($row['user_id'], $bot_ids))
{
$user_ids[] = $row['user_id'];
$usernames[$row['user_id']] = $row['username'];
}
}
$db->sql_freeresult($result);
}
@@ -516,6 +526,8 @@ class acp_prune
$sql = 'SELECT u.user_id, u.username, COUNT(p.post_id) AS queue_posts
FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u
WHERE ' . $db->sql_in_set('p.poster_id', $user_ids, false, true) . '
AND u.user_id <> ' . ANONYMOUS . '
AND u.user_type <> ' . USER_FOUNDER . '
AND p.post_visibility = ' . ITEM_UNAPPROVED . '
AND u.user_id = p.poster_id
GROUP BY p.poster_id
@@ -525,10 +537,14 @@ class acp_prune
// same intersection logic as the above group ID portion
$user_ids = $usernames = array();
while ($row = $db->sql_fetchrow($result))
{
// Do not prune bots and the user currently pruning.
if ($row['user_id'] != $user->data['user_id'] && !in_array($row['user_id'], $bot_ids))
{
$user_ids[] = $row['user_id'];
$usernames[$row['user_id']] = $row['username'];
}
}
$db->sql_freeresult($result);
}
}