Mailer project rwritten:

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

diff --git a/inc/purge/purge-general.php b/inc/purge/purge-general.php
index b37bce06136f0ab45657f527be6ffe0e266467ec..cb33c8799236f2e41ddc98e86fc63eb728a5a449 100644 (file)
--- a/inc/purge/purge-general.php
+++ b/inc/purge/purge-general.php
@@ -17,8 +17,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
        die();
 } elseif ((!isExtensionActive('autopurge')) || (!isAutoPurgingActive())) {
        // Abort here
-       return false;
+       return FALSE;
 }
 
 if (getAutoPurge() > 0) {
@@ -77,7 +77,7 @@ ORDER BY
                                SQL_FREERESULT($result_links);
 
                                // At least one link was found, enougth to pay back the points
-                               if (($userid != $content['userid']) && (isValidUserId($userid)) && ($points > 0)) {
+                               if (($userid != $content['userid']) && (isValidId($userid)) && ($points > 0)) {
                                        // Directly add points back to senders account
                                        addPointsAutoPurge($userid, $points);
                                        $points = '0';
@@ -88,11 +88,11 @@ ORDER BY
 
                                // Remove confirmation links from queue
                                addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s",
-                                       array(bigintval($content['id'])), __FILE__, __LINE__, false));
+                                       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));
+                                       array(bigintval($content['pool_id'])), __FILE__, __LINE__, FALSE));
                        } // END - if
                } // END - while
 
@@ -104,7 +104,7 @@ ORDER BY
        SQL_FREERESULT($result);
 
        // Is the 'bonus' extension installed and activated?
-       if (isExtensionActive('bonus', true)) {
+       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)) {
@@ -123,16 +123,18 @@ ORDER BY
 
                                        // Remove confirmation links from queue
                                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s",
-                                               array(bigintval($content['id'])), __FILE__, __LINE__, false));
+                                               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",
-                                               array(bigintval($content['id'])), __FILE__, __LINE__, false));
+                                               array(bigintval($content['id'])), __FILE__, __LINE__, FALSE));
                                } // END - if
                        } // END - while
 
                        // Add points to jackpot
-                       if (isExtensionActive('jackpot')) addPointsToJackpot($points);
+                       if (isExtensionActive('jackpot')) {
+                               addPointsToJackpot($points);
+                       } // END - if
 
                        // Add points for the admin
                        $admin_points += $points;