Fixes for SQL error + missing config

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

diff --git a/inc/purge/purge-inact.php b/inc/purge/purge-inact.php
index e7472ef2117f1107daaf1a9e48a6368bd9979d8b..a137f2ebb6315e07a2e528ee79773e3886aff946 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 *
@@ -51,47 +51,44 @@ if (isAutopurgeInactiveEnabled()) {
        // Init SQLs
        initSqls();
 
-       // Init exclusion list
-       // @TODO Rewrite these if() blocks to a filter
-       $excludeUserids = '';
-       if (isValidId(getDefRefid())) $excludeUserids .= ' AND `userid` != {?def_refid?}';
-
-       // Check for more extensions
-       if (isExtensionActive('beg'))     $excludeUserids .= ' AND `userid` != {?beg_userid?}';
-       if (isExtensionActive('bonus'))   $excludeUserids .= ' AND `userid` != {?bonus_userid?}';
-       if (isExtensionActive('doubler')) $excludeUserids .= ' AND `userid` != {?doubler_userid?}';
+       // Init userid exclusion
+       $excludeSql = '';
+       $excludedUserids = runFilterChain('config_userid_exclusion_sql', array());
+       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
-               $excludeUserids .= " AND `holiday_active`='N'";
+               $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?}
-       " . $excludeUserids . "
+       " . 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);
 
@@ -106,7 +103,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
 
@@ -114,18 +111,18 @@ ORDER BY
                $content['userids'] = implode(PHP_EOL, $userids);
 
                // Send mail notification to admin
-               sendAdminNotification('{--ADMIN_AUTOPURGE_INACTIVE_SUBJECT--}', 'admin_autopurge_inactive', $content);
+               sendAdminNotification('{--ADMIN_AUTOPURGE_INACTIVE_SUBJECT--}', 'admin_purge_inactive', $content);
        } // 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`
@@ -133,21 +130,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
-" . $excludeUserids . "
 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']);
 
@@ -163,12 +159,12 @@ ORDER BY
 
                // Send mail notification to admin
                if (getConfig('ap_in_notify') == 'Y') {
-                       sendAdminNotification('{--ADMIN_AUTOPURGE_DELETE_SUBJECT--}', 'admin_autopurge_delete', $useridsContent);
+                       sendAdminNotification('{--ADMIN_AUTOPURGE_DELETE_SUBJECT--}', 'admin_purge_delete', $useridsContent);
                } // END - if
        } // END - if
 
        // Free memory
-       SQL_FREERESULT($result_inactive);
+       sqlFreeResult($result_inactive);
 
        // Run all SQLs
        runFilterChain('run_sqls');