X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fautopurge%2Fpurge-general.php;h=60831e688c151630cde3f89edd3b3a49aab4511a;hb=de318c2b4c5b20c8423144a14cf26d6b8694c128;hp=c9e9bcbea2320e36ddac5c77eab940bd98e68035;hpb=c2e17d983fcbc0c3bd1dd37908d87c678f0367df;p=mailer.git

diff --git a/inc/autopurge/purge-general.php b/inc/autopurge/purge-general.php
index c9e9bcbea2..60831e688c 100644
--- 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                                *
@@ -15,10 +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 - 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 *
@@ -40,26 +39,20 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
-}
-
-// Abort if autopurge is not active or disabled by admin
-if ((!isExtensionActive('autopurge')) || (getConfig('auto_purge_active') != 'Y')) {
+} elseif ((!isExtensionActive('autopurge')) || (!isAutoPurgingActive())) {
 	// Abort here
 	return false;
 }
 
-if ((getConfig('auto_purge_active') == 'Y') && (getConfig('auto_purge') > 0)) {
+if (getAutoPurge() > 0) {
 	// Init SQLs
 	initSqls();
 
-	// First calculate the timestamp
-	$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
+	$result = SQL_QUERY('SELECT
 	s.id, s.userid, s.pool_id, t.price
 FROM
 	`{?_MYSQL_PREFIX?}_user_stats` AS s
@@ -68,13 +61,12 @@ LEFT JOIN
 ON
 	s.payment_id=t.id
 WHERE
-	s.timestamp_ordered <= (UNIX_TIMESTAMP() - %s)
+	s.timestamp_ordered <= (UNIX_TIMESTAMP() - {?auto_purge?})
 ORDER BY
-	s.userid ASC",
-		array(bigintval($PURGE)), __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0) {
+	s.userid ASC', __FILE__, __LINE__);
+	if (!SQL_HASZERONUMS($result)) {
 		// 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",
@@ -84,10 +76,10 @@ 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;
+					$points = '0';
 				} // END - if
 
 				// Add points
@@ -113,16 +105,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`",
-			array(bigintval($PURGE)), __FILE__, __LINE__);
-		if (SQL_NUMROWS($result) > 0) {
+		$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)) {
 			// 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__);
-				if (SQL_NUMROWS($result_links) > 0) {
+					array(bigintval($content['id'])), __FILE__, __LINE__);
+				if (!SQL_HASZERONUMS($result_links)) {
 					// At least one link was found, enougth to pay back the points
 					$points += $content['points'] * SQL_NUMROWS($result_links);
 
@@ -153,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(getMessage('AUTOPURGE_ADMIN_SUBJECT'), "admin_autopurge_points", translateComma($points), 0);
+		sendAdminNotification('{--ADMIN_AUTOPURGE_SUBJECT--}', 'admin_autopurge_points', $admin_points);
 	} // END - if
 
 	// Run all SQLs here
 	runFilterChain('run_sqls');
 } // END - if
 
-//
+// [EOF]
 ?>