Filters for configurable userid exclusion added:

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

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index 1357218f1b842da5131f58087a42ffd5e4d72dfc..34462b98a32ec641ee1c34d3841a7892c6c4a1c2 100644 (file)
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -254,30 +254,30 @@ function outputAdvancedOverview (&$result_main) {
 
                // 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?}';
+               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?}';
                if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
                        // Recent ext-holiday found
-                       $userExclusionSql .= " AND d.`holiday_active`='N'";
+                       $userExclusionSql .= " AND `d`.`holiday_active`='N'";
                } // END - if
 
                // Check for all accounts
                addSql("SELECT
-       d.`userid`,
-       d.`email`,
-       d.`last_online`
+       `d`.`userid`,
+       `d`.`email`,
+       `d`.`last_online`
 FROM
        `{?_MYSQL_PREFIX?}_user_data` AS `d`
 WHERE
-       d.`status`='CONFIRMED' AND
-       (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?}
+       `d`.`status`='CONFIRMED' AND
+       (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 . "
 ORDER BY
-       d.`userid` ASC");
+       `d`.`userid` ASC");
                $WHATs[]  = 'list_autopurge';
                $DESCRs[] = '{--ADMIN_TASK_INACTIVE_AUTOPURGE--}';
                $TITLEs[] = '{--ADMIN_TASK_INACTIVE_AUTOPURGE_TITLE--}';