Rewrites/fixes for handling config entries in SQLs

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

diff --git a/inc/autopurge/purge-inact.php b/inc/autopurge/purge-inact.php
index ae1d8907b5bcc9bc898b9959f12e79cf6fb9c4b3..1e725110c52fee1d8392e74fefc8aa23d87cba24 100644 (file)
--- a/inc/autopurge/purge-inact.php
+++ b/inc/autopurge/purge-inact.php
@@ -57,13 +57,13 @@ if (getConfig('autopurge_inactive') == 'Y') {
        // @TODO Rewrite these if() blocks to a filter
        $EXCLUDE_LIST = '';
        if (getConfig('def_refid') > 0) {
-               $EXCLUDE_LIST = " AND d.userid != ".getConfig('def_refid');
+               $EXCLUDE_LIST = ' AND d.`userid` != {?def_refid?}';
        } // END - if
 
        // Check for more extensions
-       if (isExtensionActive('beg'))     $EXCLUDE_LIST .= " AND d.userid != ".getConfig('beg_userid')."";
-       if (isExtensionActive('bonus'))   $EXCLUDE_LIST .= " AND d.userid != ".getConfig('bonus_userid')."";
-       if (isExtensionActive('doubler')) $EXCLUDE_LIST .= " AND d.userid != ".getConfig('doubler_userid')."";
+       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?}';
 
        // Check for new holiday extension
        if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
@@ -127,11 +127,18 @@ ORDER BY
 
        // Now let's have a look for inactive accounts we want to delete we newly use the same exclude list
        // here for e.g. excluding holiday users
-       $result_inactive = SQL_QUERY_ESC("SELECT d.userid, d.email, d.last_online
-FROM `{?_MYSQL_PREFIX?}_user_data` AS d
-WHERE `status`='CONFIRMED' AND `joined` < (UNIX_TIMESTAMP() - %s) AND `last_online` < (UNIX_TIMESTAMP() - %s) AND `ap_notified` < (UNIX_TIMESTAMP() - %s)
+       $result_inactive = SQL_QUERY_ESC("SELECT
+       d.userid, d.email, d.last_online
+FROM
+       `{?_MYSQL_PREFIX?}_user_data` AS d
+WHERE
+       `status`='CONFIRMED' AND
+       `joined` < (UNIX_TIMESTAMP() - %s) AND
+       `last_online` < (UNIX_TIMESTAMP() - %s) AND
+       `ap_notified` < (UNIX_TIMESTAMP() - %s)
 ".$EXCLUDE_LIST."
-ORDER BY `userid` ASC",
+ORDER BY
+       `userid` ASC",
                array(
                        getConfig('ap_inactive_since'),
                        getConfig('ap_inactive_since'),