Rewrote many parts:

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

diff --git a/inc/purge/purge-inact.php b/inc/purge/purge-inact.php
index 30da0a025bcf08ea4e4e001f5ab91a4cb6fb09b7..b92e90cb5f3c12673b2eda92689d2c11785c4004 100644 (file)
--- a/inc/purge/purge-inact.php
+++ b/inc/purge/purge-inact.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -54,42 +54,35 @@ if (isAutopurgeInactiveEnabled()) {
        // Init userid exclusion
        $excludeSql = '';
        $excludedUserids = runFilterChain('config_userid_exclusion_sql', array());
-       if (count($excludedUserids) > 0) {
+       if (isFilledArray($excludedUserids)) {
                // Exclude all
                $excludeSql = ' AND `userid` NOT IN (' . implode(', ', $excludedUserids) . ')';
        } // END - if
 
-       // Check for new holiday extension
-       if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
-               // Include only users with no active holiday
-               $excludeSql .= " AND `holiday_active`='N'";
-       } // END - if
-
        // Check for all accounts
-       $result_inactive = SQL_QUERY("SELECT
+       $result_inactive = sqlQuery("SELECT
        `userid`,
        `email`,
        `last_online`
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
-       `status`='CONFIRMED'
-       " . runFilterChain('user_exclusion_sql', ' ') . " AND
+       `status`='CONFIRMED' AND
        (UNIX_TIMESTAMP() - `joined`) >= {?ap_inactive_since?} AND
        (UNIX_TIMESTAMP() - `last_online`) >= {?ap_inactive_since?} AND
-       (UNIX_TIMESTAMP() - `ap_notified`) >= {?ap_inactive_since?} AND
-       " . $excludeSql . "
+       (UNIX_TIMESTAMP() - `ap_notified`) >= {?ap_inactive_since?}
+       " . runFilterChain('user_exclusion_sql', ' ' . $excludeSql) . "
 ORDER BY
        `userid` ASC", __FILE__, __LINE__);
 
-       if (!SQL_HASZERONUMS($result_inactive)) {
+       if (!ifSqlHasZeroNums($result_inactive)) {
                // Prepare variables and constants...
                $userids = array();
                $content['since'] = (getApInactiveSince() / 60 / 60);
                $content['time']  = (getApInactiveTime()  / 60 / 60);
 
                // Mark found accounts as inactive and send an email
-               while ($row = SQL_FETCHARRAY($result_inactive)) {
+               while ($row = sqlFetchArray($result_inactive)) {
                        // Merge both arrays
                        $content = merge_array($content, $row);
 
@@ -104,7 +97,7 @@ ORDER BY
                        sendEmail($content['userid'], '{--MEMBER_AUTOPURGE_INACTIVE_SUBJECT--}', $message);
 
                        // Update this account
-                       addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `ap_notified`=UNIX_TIMESTAMP() WHERE `userid`=%s LIMIT 1",
+                       addSql(sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `ap_notified`=UNIX_TIMESTAMP() WHERE `userid`=%s LIMIT 1",
                                array(bigintval($content['userid'])), __FILE__, __LINE__, FALSE));
                } // END - while
 
@@ -116,14 +109,14 @@ ORDER BY
        } // END - if
 
        // Free memory
-       SQL_FREERESULT($result_inactive);
+       sqlFreeResult($result_inactive);
 
        /*
         * Now let's have a look for inactive accounts for deletion. Use the newly
         * added exclude list here for e.g. excluding holiday users, test users et
         * cetera.
         */
-       $result_inactive = SQL_QUERY("SELECT
+       $result_inactive = sqlQuery("SELECT
        `userid`,
        `email`,
        `last_online`
@@ -131,21 +124,20 @@ FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
        `status`='CONFIRMED'
-       " . runFilterChain('user_exclusion_sql', ' ') . " AND
+       " . runFilterChain('user_exclusion_sql', ' ' . $excludeSql) . " AND
        (UNIX_TIMESTAMP() - `joined`) >= {?ap_inactive_since?} AND
        (UNIX_TIMESTAMP() - `last_online`) >= {?ap_inactive_since?} AND
        (UNIX_TIMESTAMP() - `ap_notified`) >= {?ap_inactive_time?} AND
        `ap_notified` > 0
-       " . $excludeSql . "
 ORDER BY
        `userid` ASC", __FILE__, __LINE__);
 
-       if (!SQL_HASZERONUMS($result_inactive)) {
+       if (!ifSqlHasZeroNums($result_inactive)) {
                // Prepare userid array for admin...
                $userids = array();
 
                // Delete inactive accounts
-               while ($content = SQL_FETCHARRAY($result_inactive)) {
+               while ($content = sqlFetchArray($result_inactive)) {
                        // Remember userids for the admin
                        array_push($userids, $content['userid']);
 
@@ -166,7 +158,7 @@ ORDER BY
        } // END - if
 
        // Free memory
-       SQL_FREERESULT($result_inactive);
+       sqlFreeResult($result_inactive);
 
        // Run all SQLs
        runFilterChain('run_sqls');