Rewrote many parts:

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

diff --git a/inc/purge/purge-inact.php b/inc/purge/purge-inact.php
index 45b4da7dc6c0313ba025be36fcbcf06268553f22..b92e90cb5f3c12673b2eda92689d2c11785c4004 100644 (file)
--- a/inc/purge/purge-inact.php
+++ b/inc/purge/purge-inact.php
@@ -54,17 +54,11 @@ if (isAutopurgeInactiveEnabled()) {
        // Init userid exclusion
        $excludeSql = '';
        $excludedUserids = runFilterChain('config_userid_exclusion_sql', array());
-       if (count($excludedUserids) > 0) {
+       if (isFilledArray($excludedUserids)) {
                // Exclude all
                $excludeSql = ' AND `userid` NOT IN (' . implode(', ', $excludedUserids) . ')';
        } // END - if
 
-       // Check for new holiday extension
-       if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
-               // Include only users with no active holiday
-               $excludeSql .= " AND `holiday_active`='N'";
-       } // END - if
-
        // Check for all accounts
        $result_inactive = sqlQuery("SELECT
        `userid`,
@@ -76,8 +70,8 @@ WHERE
        `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
-       " . runFilterChain('user_exclusion_sql', $excludeSql) . "
+       (UNIX_TIMESTAMP() - `ap_notified`) >= {?ap_inactive_since?}
+       " . runFilterChain('user_exclusion_sql', ' ' . $excludeSql) . "
 ORDER BY
        `userid` ASC", __FILE__, __LINE__);
 
@@ -130,7 +124,7 @@ FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
        `status`='CONFIRMED'
-       " . runFilterChain('user_exclusion_sql', $excludeSql) . " 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