Continued:

[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..2aec94b1201d45fef5d5b17f2a80b095d5884fbe 100644 (file)
--- a/inc/modules/admin/what-list_autopurge.php
+++ b/inc/modules/admin/what-list_autopurge.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2016 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -44,22 +44,17 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // Exclude default referral id if set
-$userExclusionSql = ' ';
-$excludedUserids = runFilterChain('config_userid_exclusion_sql', array());
-if (count($excludedUserids) > 0) {
+$userExcludeSql = ' ';
+$excludedUserids = runFilterChain('config_userid_exclusion_sql', []);
+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`.`sex`,
        `d`.`surname`,
        `d`.`family`,
        `d`.`email`,
@@ -73,18 +68,18 @@ 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 (!ifSqlHasZeroNumRows($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'],
-                       'gender'      => $content['gender'],
+                       'sex'      => $content['sex'],
                        'surname'     => $content['surname'],
                        'family'      => $content['family'],
                        'email'       => '<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['email'] . '</a>',
@@ -98,7 +93,7 @@ if (!SQL_HASZERONUMS($result)) {
        } // END - while
 
        // Free memory
-       SQL_FREERESULT($result);
+       sqlFreeResult($result);
        $content['rows'] = $OUT;
 
        // Load main template