Mailer project continued (heavy refactoring):

[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 60570ece3307b7c434823eb65cb9900d9ee2e586..ed1611572c51a5217c1f22e31c0d195ec3beca44 100644 (file)
--- a/inc/modules/admin/what-list_autopurge.php
+++ b/inc/modules/admin/what-list_autopurge.php
@@ -45,16 +45,23 @@ addYouAreHereLink('admin', __FILE__);
 
 // Exclude default referral id if set
 // @TODO Rewrite those lines to filter
-$EXCLUDE_LIST = '';
-if (isValidUserId(getDefRefid()))              $EXCLUDE_LIST .= ' AND d.userid != {?def_refid?}';
-if (isExtensionActive('beg'))                  $EXCLUDE_LIST .= ' AND d.userid != {?beg_userid?}';
-if (isExtensionActive('bonus'))                $EXCLUDE_LIST .= ' AND d.userid != {?bonus_userid?}';
-if (isExtensionActive('doubler'))              $EXCLUDE_LIST .= ' AND d.userid != {?doubler_userid?}';
-if (isExtensionInstalledAndNewer('holiday', '0.1.3')) $EXCLUDE_LIST .= " AND d.`holiday_active`='N'";
+$userExclusionSql = runFilterChain('user_exclusion_sql', ' ');
+if (isValidUserId(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')) $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
 WHERE
@@ -62,7 +69,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?}
-       ".$EXCLUDE_LIST."
+       " . $userExclusionSql . "
 ORDER BY
        d.`userid` ASC", __FILE__, __LINE__);