Rewrites to use filters instead of mass if() blocks

[mailer.git] / inc / libs / task_functions.php

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index 34462b98a32ec641ee1c34d3841a7892c6c4a1c2..254c53af5e80fdefcccbcc573c114fe4a4f073c9 100644 (file)
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -248,16 +248,14 @@ function outputAdvancedOverview (&$result_main) {
        if ((isExtensionActive('autopurge')) && (isExtensionActive('user'))) {
                // Start finding them...
                $userExclusionSql = ' ';
-
-               // Exclude test accounts
-               $userExclusionSql = runFilterChain('user_exclusion_sql', ' ');
+               $excludedUserids = runFilterChain('config_userid_exclusion_sql', array());
+               if (count($excludedUserids) > 0) {
+                       // Exclude all
+                       $userExcludeSql = ' AND `d`.`userid` NOT IN (' . implode(', ', $excludedUserids) . ')';
+               } // END - if
 
                // Check for more extensions
-               // @TODO These can be rewritten to filter
-               if (isValidId(getDefRefid()))              $userExclusionSql .= ' AND `d`.`userid` != {?def_refid?}';
-               if (isExtensionActive('beg'))                  $userExclusionSql .= ' AND `d`.`userid` != {?beg_userid?}';
-               if (isExtensionActive('bonus'))                $userExclusionSql .= ' AND `d`.`userid` != {?bonus_userid?}';
-               if (isExtensionActive('doubler'))              $userExclusionSql .= ' AND `d`.`userid` != {?doubler_userid?}';
+               // @TODO This can be rewritten to filter
                if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
                        // Recent ext-holiday found
                        $userExclusionSql .= " AND `d`.`holiday_active`='N'";
@@ -275,7 +273,7 @@ WHERE
        (UNIX_TIMESTAMP() - `d`.`joined`) >= {?ap_inactive_since?} AND
        (UNIX_TIMESTAMP() - `d`.`last_online`) >= {?ap_inactive_since?} AND
        (UNIX_TIMESTAMP() - `d`.`ap_notified`) >= {?ap_inactive_since?}
-" . $userExclusionSql . "
+       " . runFilterChain('user_exclusion_sql', $userExcludeSql) . "
 ORDER BY
        `d`.`userid` ASC");
                $WHATs[]  = 'list_autopurge';