Added update_year.sh (still not fully flexible) and updated all years with it.

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

diff --git a/inc/purge/purge-general.php b/inc/purge/purge-general.php
index 3694ae702759ce609755bcecf9a5ed6fb3a1f333..3def007242ec6ff979174b56184c69057a75473b 100644 (file)
--- a/inc/purge/purge-general.php
+++ b/inc/purge/purge-general.php
@@ -17,7 +17,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -52,32 +52,28 @@ if (getAutoPurge() > 0) {
        $admin_points = '0';
 
        // Then check for outdated mail order. We don't delete them just the confirmation links will be deleted.
-       $result = SQL_QUERY('SELECT
-       `s`.`id`,
-       `s`.`userid`,
-       `s`.`pool_id`,
-       `t`.`price`
+       $result = sqlQuery('SELECT
+       `id`,
+       `userid`,
+       `pool_id`,
+       `payment_id`
 FROM
-       `{?_MYSQL_PREFIX?}_user_stats` AS `s`
-LEFT JOIN
-       `{?_MYSQL_PREFIX?}_payments` AS `t`
-ON
-       `s`.`payment_id`=`t`.`id`
+       `{?_MYSQL_PREFIX?}_user_stats`
 WHERE
-       (UNIX_TIMESTAMP() - `s`.`timestamp_ordered`) >= {?auto_purge?}
+       (UNIX_TIMESTAMP() - `timestamp_ordered`) >= {?auto_purge?}
 ORDER BY
-       `s`.`userid` ASC', __FILE__, __LINE__);
-       if (!SQL_HASZERONUMS($result)) {
+       `userid` ASC', __FILE__, __LINE__);
+       if (!ifSqlHasZeroNums($result)) {
                // Start deleting procedure
                $userid = NULL;
                $points = '0';
-               while ($content = SQL_FETCHARRAY($result)) {
+               while ($content = sqlFetchArray($result)) {
                        // Check if confirmation links are purged or not
-                       $result_links = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s LIMIT 1",
+                       $result_links = sqlQueryEscaped("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s LIMIT 1",
                                array(bigintval($content['id'])), __FILE__, __LINE__);
 
                        // Is there one entry?
-                       if (SQL_NUMROWS($result_links) == 1) {
+                       if (sqlNumRows($result_links) == 1) {
                                // At least one link was found, enougth to pay back the points
                                if (($userid != $content['userid']) && (isValidId($userid)) && ($points > 0)) {
                                        // Directly add points back to senders account
@@ -87,20 +83,19 @@ ORDER BY
 
                                // Add points
                                $userid = $content['userid'];
-                               $points += $content['price'];
+                               $points += getPaymentPrice($content['payment_id']);
                                $admin_points += $content['price'];
 
                                // Remove confirmation links from queue
-                               addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s",
+                               addSql(sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s",
                                        array(bigintval($content['id'])), __FILE__, __LINE__, FALSE));
 
                                // Update status of order
-                               addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `data_type`='DELETED' WHERE `id`=%s LIMIT 1",
-                                       array(bigintval($content['pool_id'])), __FILE__, __LINE__, FALSE));
+                               updatePoolDataById($content['pool_id'], 'data_type', 'DELETED');
                        } // END - if
 
                        // Free memory
-                       SQL_FREERESULT($result_links);
+                       sqlFreeResult($result_links);
                } // END - while
 
                // Are some points collected?
@@ -111,32 +106,32 @@ ORDER BY
        } // END - if
 
        // Free memory
-       SQL_FREERESULT($result);
+       sqlFreeResult($result);
 
        // Is the 'bonus' extension installed and activated?
        if (isExtensionActive('bonus', TRUE)) {
                // Check for bonus campaigns
-               $result = SQL_QUERY("SELECT `id`, `points` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `data_type`='SEND' AND `timestamp` <= {?auto_purge?} ORDER BY `id` ASC", __FILE__, __LINE__);
-               if (!SQL_HASZERONUMS($result)) {
+               $result = sqlQuery("SELECT `id`, `points` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `data_type`='SEND' AND `timestamp` <= {?auto_purge?} ORDER BY `id` ASC", __FILE__, __LINE__);
+               if (!ifSqlHasZeroNums($result)) {
                        // Start deleting procedure
                        $points = '0';
-                       while ($content = SQL_FETCHARRAY($result)) {
+                       while ($content = sqlFetchArray($result)) {
                                // Check if confirmation links are purged or not
-                               $result_links = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s",
+                               $result_links = sqlQueryEscaped("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s",
                                        array(bigintval($content['id'])), __FILE__, __LINE__);
-                               if (!SQL_HASZERONUMS($result_links)) {
+                               if (!ifSqlHasZeroNums($result_links)) {
                                        // At least one link was found, enougth to pay back the points
-                                       $points += $content['points'] * SQL_NUMROWS($result_links);
+                                       $points += $content['points'] * sqlNumRows($result_links);
 
                                        // Free memory
-                                       SQL_FREERESULT($result_links);
+                                       sqlFreeResult($result_links);
 
                                        // Remove confirmation links from queue
-                                       addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s",
+                                       addSql(sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s",
                                                array(bigintval($content['id'])), __FILE__, __LINE__, FALSE));
 
                                        // Update status of order
-                                       addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_bonus` SET `data_type`='DELETED' WHERE `id`=%s LIMIT 1",
+                                       addSql(sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_bonus` SET `data_type`='DELETED' WHERE `id`=%s LIMIT 1",
                                                array(bigintval($content['id'])), __FILE__, __LINE__, FALSE));
                                } // END - if
                        } // END - while
@@ -152,7 +147,7 @@ ORDER BY
                } // END - if
 
                // Free memory
-               SQL_FREERESULT($result);
+               sqlFreeResult($result);
        } // END - if
 
        // Add points from deleted accounts to jackpot, but here just add to notify mail