Rewrites to use filters instead of mass if() blocks

[mailer.git] / inc / purge / purge-inact.php

diff --git a/inc/purge/purge-inact.php b/inc/purge/purge-inact.php
index 30da0a025bcf08ea4e4e001f5ab91a4cb6fb09b7..ee364dedc2675a174cfe16bb17b7a8aa8b0029ac 100644 (file)
--- a/inc/purge/purge-inact.php
+++ b/inc/purge/purge-inact.php
@@ -73,12 +73,11 @@ if (isAutopurgeInactiveEnabled()) {
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
-       `status`='CONFIRMED'
-       " . runFilterChain('user_exclusion_sql', ' ') . " AND
+       `status`='CONFIRMED' AND
        (UNIX_TIMESTAMP() - `joined`) >= {?ap_inactive_since?} AND
        (UNIX_TIMESTAMP() - `last_online`) >= {?ap_inactive_since?} AND
        (UNIX_TIMESTAMP() - `ap_notified`) >= {?ap_inactive_since?} AND
-       " . $excludeSql . "
+       " . runFilterChain('user_exclusion_sql', $excludeSql) . "
 ORDER BY
        `userid` ASC", __FILE__, __LINE__);
 
@@ -131,12 +130,11 @@ FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
        `status`='CONFIRMED'
-       " . runFilterChain('user_exclusion_sql', ' ') . " AND
+       " . runFilterChain('user_exclusion_sql', $excludeSql) . " AND
        (UNIX_TIMESTAMP() - `joined`) >= {?ap_inactive_since?} AND
        (UNIX_TIMESTAMP() - `last_online`) >= {?ap_inactive_since?} AND
        (UNIX_TIMESTAMP() - `ap_notified`) >= {?ap_inactive_time?} AND
        `ap_notified` > 0
-       " . $excludeSql . "
 ORDER BY
        `userid` ASC", __FILE__, __LINE__);