Filters for configurable userid exclusion added:

[mailer.git] / inc / modules / admin / what-list_autopurge.php

diff --git a/inc/modules/admin/what-list_autopurge.php b/inc/modules/admin/what-list_autopurge.php
index 3213480bbf2cdb004c444d7f2e47a71dcb80f1e3..eb76f798e2012836c340c4b0c33ffe878ab02346 100644 (file)
--- a/inc/modules/admin/what-list_autopurge.php
+++ b/inc/modules/admin/what-list_autopurge.php
@@ -50,28 +50,28 @@ if (isValidId(getDefRefid()))                         $userExclusionSql .= ' AND
 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')) $userExclusionSql .= " AND d.`holiday_active`='N'";
+if (isExtensionInstalledAndNewer('holiday', '0.1.3')) $userExclusionSql .= " AND `d`.`holiday_active`='N'";
 
 // Check for all accounts
 $result = SQL_QUERY("SELECT
-       d.`userid`,
-       d.`gender`,
-       d.`surname`,
-       d.`family`,
-       d.`email`,
-       d.`joined`,
-       d.`last_online`,
-       d.`ap_notified`
+       `d`.`userid`,
+       `d`.`gender`,
+       `d`.`surname`,
+       `d`.`family`,
+       `d`.`email`,
+       `d`.`joined`,
+       `d`.`last_online`,
+       `d`.`ap_notified`
 FROM
-       `{?_MYSQL_PREFIX?}_user_data` AS d
+       `{?_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", __FILE__, __LINE__);
+       `d`.`userid` ASC", __FILE__, __LINE__);
 
 if (!SQL_HASZERONUMS($result)) {
        // Ok, we have found some inactive accounts