From: Roland Häder <roland@mxchange.org>
Date: Thu, 29 Oct 2009 23:37:23 +0000 (+0000)
Subject: Fixes for reset
X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=a7ff568826f2d0472ef4ef24f983b1406311e52f

Fixes for reset
---

diff --git a/inc/autopurge/purge-mails.php b/inc/autopurge/purge-mails.php
index 5741d36d20..982795f103 100644
--- a/inc/autopurge/purge-mails.php
+++ b/inc/autopurge/purge-mails.php
@@ -42,15 +42,13 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Abort if autopurge is not active or disabled by admin
-if ((!isExtensionActive('autopurge')) || (getConfig('auto_purge_active') != 'Y')) {
+if ((!isExtensionActive('autopurge')) || (getConfig('auto_purge_active') != 'Y') || (getConfig('ap_del_mails') != 'Y')) {
 	// Abort here
 	return false;
 } // END - if
 
-// Search for mails from deleted members?
-if (getConfig('ap_del_mails') == 'Y') {
-	// Okay, let's check for them...
-	$result_mails = SQL_QUERY("SELECT
+// Okay, let's check for deleted mails
+$result_mails = SQL_QUERY("SELECT
 	`sender`
 FROM
 	`{?_MYSQL_PREFIX?}_pool`
@@ -59,24 +57,24 @@ WHERE
 ORDER BY
 	`sender` ASC", __FILE__, __LINE__);
 
-	// Reset counter...
-	$DELETED = 0;
+// Reset counter...
+$DELETED = 0;
 
-	// Do we have "purged" mails?
-	if (SQL_NUMROWS($result_mails) > 0) {
-		// Okay, check for their sender's
-		while ($content = SQL_FETCHARRAY($result_mails)) {
-			// Check now...
-			$fount = SQL_NUMROWS(SQL_QUERY_ESC("SELECT userid FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
+// Do we have "purged" mails?
+if (SQL_NUMROWS($result_mails) > 0) {
+	// Okay, check for their sender's
+	while ($content = SQL_FETCHARRAY($result_mails)) {
+		// Check now...
+		$fount = SQL_NUMROWS(SQL_QUERY_ESC("SELECT userid FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
 			array(bigintval($content['sender'])), __FILE__, __LINE__));
-			if ($found == 0) {
-				// Okay we found some mails!
-				SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_pool` WHERE `sender`=%s",
-					array(bigintval($content['sender'])), __FILE__, __LINE__);
-				$DELETED += SQL_AFFECTEDROWS();
+		if ($found == 0) {
+			// Okay we found some mails!
+			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_pool` WHERE `sender`=%s",
+				array(bigintval($content['sender'])), __FILE__, __LINE__);
+			$DELETED += SQL_AFFECTEDROWS();
 
-				// Reset query (to prevent possible errors) ...;
-				$result_mails = SQL_QUERY("SELECT
+			// Reset query (to prevent possible errors) ...;
+			$result_mails = SQL_QUERY("SELECT
 	`sender`
 FROM
 	`{?_MYSQL_PREFIX?}_pool`
@@ -84,58 +82,57 @@ WHERE
 	`data_type`='DELETED' AND timestamp <= (UNIX_TIMESTAMP() - {?ap_dm_timeout?})
 ORDER BY
 	`sender` ASC", __FILE__, __LINE__);
-			}
 		}
 	}
+}
 
-	// Free memory
-	SQL_FREERESULT($result_mails);
+// Free memory
+SQL_FREERESULT($result_mails);
 
-	// Now let's check for stats entries as well;
-	$result_mails = SQL_QUERY("SELECT
+// Now let's check for stats entries as well;
+$result_mails = SQL_QUERY("SELECT
 	`userid` AS sender
 FROM
 	`{?_MYSQL_PREFIX?}_user_stats`
 WHERE
-	`data_type`='DELETED' AND `timestamp_send` <= (UNIX_TIMESTAMP() - {?ap_dm_timeout?})
+	`timestamp_send` <= (UNIX_TIMESTAMP() - {?ap_dm_timeout?})
 ORDER BY
 	`sender` ASC", __FILE__, __LINE__);
 
-	// Do we have "purged" mails?
-	if (SQL_NUMROWS($result_mails) > 0) {
-		// Okay, check for their sender's
-		while ($content = SQL_FETCHARRAY($result_mails)) {
-			// Check now...
-			$found = SQL_NUMROWS(SQL_QUERY_ESC("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
-				array(bigintval($content['sender'])), __FILE__, __LINE__));
-			if ($found == 0) {
-				// Okay we found some mails!
-				SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `sender`=%s",
-					array(bigintval($content['sender'])), __FILE__, __LINE__);
-				$DELETED += SQL_AFFECTEDROWS();
+// Do we have "purged" mails?
+if (SQL_NUMROWS($result_mails) > 0) {
+	// Okay, check for their sender's
+	while ($content = SQL_FETCHARRAY($result_mails)) {
+		// Check now...
+		$found = SQL_NUMROWS(SQL_QUERY_ESC("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
+			array(bigintval($content['sender'])), __FILE__, __LINE__));
+		if ($found == 0) {
+			// Okay we found some mails!
+			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `sender`=%s",
+				array(bigintval($content['sender'])), __FILE__, __LINE__);
+			$DELETED += SQL_AFFECTEDROWS();
 
-				// Reset query (to prevent possible errors) ...
-				$result_mails = SQL_QUERY("SELECT
+			// Reset query (to prevent possible errors) ...
+			$result_mails = SQL_QUERY("SELECT
 	`userid` AS sender
 FROM
 	`{?_MYSQL_PREFIX?}_user_stats`
 WHERE
-	`data_type`='DELETED' AND timestamp_send <= (UNIX_TIMESTAMP() - {?ap_dm_timeout?})
+	`timestamp_send` <= (UNIX_TIMESTAMP() - {?ap_dm_timeout?})
 ORDER BY
 	`sender` ASC", __FILE__, __LINE__);
-			}
 		}
 	}
+}
 
-	// Free memory
-	SQL_FREERESULT($result_mails);
+// Free memory
+SQL_FREERESULT($result_mails);
 
-	// Do we have deleted mails and the admin want's to receive a notification
-	if (($DELETED > 0) && (getConfig('ap_dm_notify') == 'Y')) {
-		// Send out email to admin
-		sendAdminNotification(getMessage('AUTOPURGE_ADMIN_DEL_MAILS_SUBJECT'), 'admin_autopurge_del_mails', $DELETED, '');
-	} // END - if
-}
+// Do we have deleted mails and the admin want's to receive a notification
+if (($DELETED > 0) && (getConfig('ap_dm_notify') == 'Y')) {
+	// Send out email to admin
+	sendAdminNotification(getMessage('AUTOPURGE_ADMIN_DEL_MAILS_SUBJECT'), 'admin_autopurge_del_mails', $DELETED, '');
+} // END - if
 
 //
 ?>
diff --git a/inc/reset/reset_birthday.php b/inc/reset/reset_birthday.php
index dfadfaca9f..2614f26b4d 100644
--- a/inc/reset/reset_birthday.php
+++ b/inc/reset/reset_birthday.php
@@ -55,7 +55,7 @@ $year  = date('Y', time());
 // Shall I include only active members?
 $add = "%s"; $value = '';
 if ((getConfig('birthday_active')) && (isExtensionActive('autopurge')) && (getConfig('autopurge_inactive') == 'Y') && (getConfig('ap_inactive_since') > 0)) {
-	$add = " AND `last_online` >= (UNIX_TIMESTAP() - %s)";
+	$add = " AND `last_online` >= (UNIX_TIMESTAMP() - %s)";
 	$value = getConfig('ap_inactive_since');
 } // END - if
 
@@ -69,7 +69,8 @@ WHERE
 	`birth_month`=%s AND
 	`birthday_sent` < (UNIX_TIMESTAMP() - ".(getConfig('ONE_DAY') * 364).")
 	".$add."
-ORDER BY `userid` ASC",
+ORDER BY
+	`userid` ASC",
 	array($day, $month, $value), __FILE__, __LINE__);
 
 if (SQL_NUMROWS($result_birthday) > 0) {