mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
Fix bug #44295 - Cannot prune users who never logged in
Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9754 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
ecfe24528c
commit
5cbf5d4b16
3 changed files with 8 additions and 2 deletions
|
@ -152,6 +152,7 @@
|
||||||
<li>[Fix] Correctly detect GZIP status in debug mode. (Bug #24075 - Patch by rxu)</li>
|
<li>[Fix] Correctly detect GZIP status in debug mode. (Bug #24075 - Patch by rxu)</li>
|
||||||
<li>[Fix] Posting smilies in view more smilies now work again in IE (Bug #46025 - Patch by leviatan21)</li>
|
<li>[Fix] Posting smilies in view more smilies now work again in IE (Bug #46025 - Patch by leviatan21)</li>
|
||||||
<li>[Fix] Properly convert and show filesize information (Bug #47775 - Patch by bantu)</li>
|
<li>[Fix] Properly convert and show filesize information (Bug #47775 - Patch by bantu)</li>
|
||||||
|
<li>[Fix] Add ability to prune users who never logged in. (Bug #44295 - Patch by rxu)</li>
|
||||||
<li>[Fix] Smilies and images not viewed in topic-print view (Bug #47265 - Patch by nickvergessen)</li>
|
<li>[Fix] Smilies and images not viewed in topic-print view (Bug #47265 - Patch by nickvergessen)</li>
|
||||||
<li>[Fix] Force full date for PMs print-view (Patch by nickvergessen)</li>
|
<li>[Fix] Force full date for PMs print-view (Patch by nickvergessen)</li>
|
||||||
<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
|
<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
|
||||||
|
|
|
@ -406,7 +406,12 @@ class acp_prune
|
||||||
$where_sql .= (sizeof($joined)) ? " AND user_regdate " . $key_match[$joined_select] . ' ' . gmmktime(0, 0, 0, (int) $joined[1], (int) $joined[2], (int) $joined[0]) : '';
|
$where_sql .= (sizeof($joined)) ? " AND user_regdate " . $key_match[$joined_select] . ' ' . gmmktime(0, 0, 0, (int) $joined[1], (int) $joined[2], (int) $joined[0]) : '';
|
||||||
$where_sql .= ($count !== '') ? " AND user_posts " . $key_match[$count_select] . ' ' . (int) $count . ' ' : '';
|
$where_sql .= ($count !== '') ? " AND user_posts " . $key_match[$count_select] . ' ' . (int) $count . ' ' : '';
|
||||||
|
|
||||||
if (sizeof($active) && $active_select != 'lt')
|
// First handle pruning of users who never logged in, last active date is 0000-00-00
|
||||||
|
if (sizeof($active) && (int) $active[0] == 0 && (int) $active[1] == 0 && (int) $active[2] == 0)
|
||||||
|
{
|
||||||
|
$where_sql .= ' AND user_lastvisit = 0';
|
||||||
|
}
|
||||||
|
else if (sizeof($active) && $active_select != 'lt')
|
||||||
{
|
{
|
||||||
$where_sql .= ' AND user_lastvisit ' . $key_match[$active_select] . ' ' . gmmktime(0, 0, 0, (int) $active[1], (int) $active[2], (int) $active[0]);
|
$where_sql .= ' AND user_lastvisit ' . $key_match[$active_select] . ' ' . gmmktime(0, 0, 0, (int) $active[1], (int) $active[2], (int) $active[0]);
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,7 +47,7 @@ $lang = array_merge($lang, array(
|
||||||
|
|
||||||
'JOINED_EXPLAIN' => 'Enter a date in <kbd>YYYY-MM-DD</kbd> format.',
|
'JOINED_EXPLAIN' => 'Enter a date in <kbd>YYYY-MM-DD</kbd> format.',
|
||||||
|
|
||||||
'LAST_ACTIVE_EXPLAIN' => 'Enter a date in <kbd>YYYY-MM-DD</kbd> format.',
|
'LAST_ACTIVE_EXPLAIN' => 'Enter a date in <kbd>YYYY-MM-DD</kbd> format. Enter <kbd>0000-00-00</kbd> to prune users who never logged in, <em>Before</em> and <em>After</em> conditions will be ignored.',
|
||||||
|
|
||||||
'PRUNE_USERS_LIST' => 'Users to be pruned',
|
'PRUNE_USERS_LIST' => 'Users to be pruned',
|
||||||
'PRUNE_USERS_LIST_DELETE' => 'With the selected critera for pruning users the following accounts will be removed.',
|
'PRUNE_USERS_LIST_DELETE' => 'With the selected critera for pruning users the following accounts will be removed.',
|
||||||
|
|
Loading…
Add table
Reference in a new issue