The yearly copyright-update commit. 2009, 2010 are now copyrighted on the developer...

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

diff --git a/inc/autopurge/purge-general.php b/inc/autopurge/purge-general.php
index c1e0ffa31f4af83910b392c1443fbf7a2a32aeb0..1de67fc62a73428196e7e1d9263ac253388fcc62 100644 (file)
--- a/inc/autopurge/purge-general.php
+++ b/inc/autopurge/purge-general.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 09/14/2008 *
- * ===============                              Last change: 09/14/2008 *
+ * Mailer v0.2.1-FINAL                                Start: 09/14/2008 *
+ * ===================                          Last change: 09/14/2008 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : purge-general.php                                *
@@ -19,6 +19,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -56,7 +57,7 @@ if ((getConfig('auto_purge_active') == 'Y') && (getConfig('auto_purge') > 0)) {
        $PURGE = getConfig('auto_purge');
 
        // Init variables
-       $admin_points = 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_ESC("SELECT
@@ -74,7 +75,7 @@ ORDER BY
                array(bigintval($PURGE)), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
                // Start deleting procedure
-               $userid = 0; $points = 0;
+               $userid = '0'; $points = '0';
                while ($content = SQL_FETCHARRAY($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",
@@ -87,7 +88,7 @@ ORDER BY
                                if (($userid != $content['userid']) && ($userid > 0) && ($points > 0)) {
                                        // Directly add points back to senders account
                                        addPointsAutoPurge($userid, $points);
-                                       $points = 0;
+                                       $points = '0';
                                } // END - if
 
                                // Add points
@@ -113,15 +114,15 @@ ORDER BY
        // Is the 'bonus' extension installed and activated?
        if (isExtensionActive('bonus', true)) {
                // Check for bonus campaigns
-               $result = SQL_QUERY_ESC("SELECT `id`, `points` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `data_type`='SEND' AND timestamp <= %s ORDER BY `id`",
+               $result = SQL_QUERY_ESC("SELECT `id`, `points` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `data_type`='SEND' AND `timestamp` <= %s ORDER BY `id` ASC",
                        array(bigintval($PURGE)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) > 0) {
                        // Start deleting procedure
-                       $points = 0;
+                       $points = '0';
                        while ($content = SQL_FETCHARRAY($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",
-                               array(bigintval($content['id'])), __FILE__, __LINE__);
+                                       array(bigintval($content['id'])), __FILE__, __LINE__);
                                if (SQL_NUMROWS($result_links) > 0) {
                                        // At least one link was found, enougth to pay back the points
                                        $points += $content['points'] * SQL_NUMROWS($result_links);
@@ -153,7 +154,7 @@ ORDER BY
        // Add points from deleted accounts to jackpot, but here just add to notify mail
        if ($admin_points > 0) {
                // Send mail to admin
-               sendAdminNotification(getMessage('AUTOPURGE_ADMIN_SUBJECT'), "admin_autopurge_points", translateComma($points), '0');
+               sendAdminNotification(getMessage('AUTOPURGE_ADMIN_SUBJECT'), 'admin_autopurge_points', translateComma($admin_points));
        } // END - if
 
        // Run all SQLs here