Fixed bad naming of variable

[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 4291eb17dd312d2314506fe58a94c4249c492469..861acbd4972126d8d95e81acc1da48be4f71847b 100644 (file)
--- a/inc/modules/admin/what-list_autopurge.php
+++ b/inc/modules/admin/what-list_autopurge.php
@@ -44,20 +44,15 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // Exclude default referral id if set
-$userExclusionSql = ' ';
+$userExcludeSql = ' ';
 $excludedUserids = runFilterChain('config_userid_exclusion_sql', array());
-if (count($excludedUserids) > 0) {
+if (isFilledArray($excludedUserids)) {
        // Exclude all
        $userExcludeSql = ' AND `d`.`userid` NOT IN (' . implode(', ', $excludedUserids) . ')';
 } // END - if
 
-// @TODO Rewrite this as a filter
-if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
-       $userExclusionSql .= " AND `d`.`holiday_active`='N'";
-} // END - if
-
 // Check for all accounts
-$result = SQL_QUERY("SELECT
+$result = sqlQuery("SELECT
        `d`.`userid`,
        `d`.`gender`,
        `d`.`surname`,
@@ -73,14 +68,14 @@ 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?}
-       " . runFilterChain('user_exclusion_sql', $userExcludeSql) . "
+       " . runFilterChain('user_exclusion_sql', ' ' . $userExcludeSql) . "
 ORDER BY
        `d`.`userid` ASC", __FILE__, __LINE__);
 
-if (!SQL_HASZERONUMS($result)) {
+if (!ifSqlHasZeroNums($result)) {
        // Ok, we have found some inactive accounts
        $OUT = '';
-       while ($content = SQL_FETCHARRAY($result)) {
+       while ($content = sqlFetchArray($result)) {
                // Prepare data for the row template
                $content = array(
                        'userid'      => $content['userid'],
@@ -98,7 +93,7 @@ if (!SQL_HASZERONUMS($result)) {
        } // END - while
 
        // Free memory
-       SQL_FREERESULT($result);
+       sqlFreeResult($result);
        $content['rows'] = $OUT;
 
        // Load main template