Extension ext-coupon continued, a lot improvements applied:

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

diff --git a/inc/autopurge/purge-general.php b/inc/autopurge/purge-general.php
index c932ff47df0686a215b28a140b73e8e01c362744..30c18977e406b2e62e40ac4afdffd2be1ade0adf 100644 (file)
--- a/inc/autopurge/purge-general.php
+++ b/inc/autopurge/purge-general.php
@@ -15,11 +15,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -54,18 +52,18 @@ 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
+       $result = SQL_QUERY('SELECT
        s.id, s.userid, s.pool_id, t.price
 FROM
        `{?_MYSQL_PREFIX?}_user_stats` AS s
 LEFT JOIN
        `{?_MYSQL_PREFIX?}_payments` AS t
 ON
-       s.payment_id=t.id
+       s.`payment_id`=t.`id`
 WHERE
-       s.timestamp_ordered <= (UNIX_TIMESTAMP() - {?auto_purge?})
+       (UNIX_TIMESTAMP() - s.`timestamp_ordered`) >= {?auto_purge?}
 ORDER BY
-       s.userid ASC", __FILE__, __LINE__);
+       s.userid ASC', __FILE__, __LINE__);
        if (!SQL_HASZERONUMS($result)) {
                // Start deleting procedure
                $userid = '0'; $points = '0';
@@ -78,7 +76,7 @@ ORDER BY
                                SQL_FREERESULT($result_links);
 
                                // At least one link was found, enougth to pay back the points
-                               if (($userid != $content['userid']) && ($userid > 0) && ($points > 0)) {
+                               if (($userid != $content['userid']) && (isValidUserId($userid)) && ($points > 0)) {
                                        // Directly add points back to senders account
                                        addPointsAutoPurge($userid, $points);
                                        $points = '0';
@@ -146,12 +144,12 @@ 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('{--ADMIN_AUTOPURGE_SUBJECT--}', 'admin_autopurge_points', translateComma($admin_points));
+               sendAdminNotification('{--ADMIN_AUTOPURGE_SUBJECT--}', 'admin_autopurge_points', $admin_points);
        } // END - if
 
        // Run all SQLs here
        runFilterChain('run_sqls');
 } // END - if
 
-//
+// [EOF]
 ?>