X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fautopurge.php;h=6873a1542ad1cb5345402087602c28d2bfbf5d44;hb=8127c0351f2fe329e72d9fd302ba3c5f30d1fab0;hp=7c98694ed7e1dc7c2c3e8ca624136116ed96ea63;hpb=307a4e11763f0914e73dc756b219356e1c29ab25;p=mailer.git

diff --git a/inc/autopurge.php b/inc/autopurge.php
index 7c98694ed7..6873a1542a 100644
--- a/inc/autopurge.php
+++ b/inc/autopurge.php
@@ -67,7 +67,7 @@ WHERE s.timestamp_ordered <= %s ORDER BY s.userid",
 		while(list($mid, $sender, $pool, $price) = SQL_FETCHROW($result))
 		{
 			// Check if confirmation links are purged or not
-			$result_links = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_user_links WHERE stats_id=%d LIMIT 1",
+			$result_links = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_user_links WHERE stats_id=%s LIMIT 1",
 			 array(bigintval($mid)), __FILE__, __LINE__);
 			if (SQL_NUMROWS($result_links) == 1)
 			{
@@ -85,11 +85,11 @@ WHERE s.timestamp_ordered <= %s ORDER BY s.userid",
 				$uid = $sender; $points += $price; $admin_points += $price;
 
 				// Remove confirmation links from queue
-				$result_del = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_links WHERE stats_id=%d",
+				$result_del = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_links WHERE stats_id=%s",
 				 array(bigintval($mid)), __FILE__, __LINE__);
 
 				// Update status of order
-				$result_update = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET data_type='DELETED' WHERE id=%d LIMIT 1",
+				$result_update = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET data_type='DELETED' WHERE id=%s LIMIT 1",
 				 array(bigintval($pool)), __FILE__, __LINE__);
 			}
 		}
@@ -114,7 +114,7 @@ WHERE s.timestamp_ordered <= %s ORDER BY s.userid",
 			while (list($bid, $price) = SQL_FETCHROW($result))
 			{
 				// Check if confirmation links are purged or not
-				$result_links = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_user_links WHERE bonus_id=%d",
+				$result_links = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_user_links WHERE bonus_id=%s",
 				 array(bigintval($bid)), __FILE__, __LINE__);
 				if (SQL_NUMROWS($result_links) > 0)
 				{
@@ -125,11 +125,11 @@ WHERE s.timestamp_ordered <= %s ORDER BY s.userid",
 					SQL_FREERESULT($result_links);
 
 					// Remove confirmation links from queue
-					$result_del = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_links WHERE bonus_id=%d",
+					$result_del = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_links WHERE bonus_id=%s",
 					 array(bigintval($bid)), __FILE__, __LINE__);
 
 					// Update status of order
-					$result_update = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_bonus SET data_type='DELETED' WHERE id=%d LIMIT 1",
+					$result_update = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_bonus SET data_type='DELETED' WHERE id=%s LIMIT 1",
 					 array(bigintval($bid)), __FILE__, __LINE__);
 				}
 			}
@@ -149,15 +149,7 @@ WHERE s.timestamp_ordered <= %s ORDER BY s.userid",
 	if ($admin_points > 0)
 	{
 		// Send mail to admin
-		if (GET_EXT_VERSION("admins") >= "0.4.1")
-		{
-			SEND_ADMIN_EMAILS_PRO(AUTOPURGE_ADMIN_SUBJECT, "admin_autopurge_points", TRANSLATE_COMMA($points), "0");
-		}
-		 else
-		{
-			$msg = LOAD_EMAIL_TEMPLATE("admin_autopurge_points", TRANSLATE_COMMA($points), "0");
-			SEND_ADMIN_EMAILS(AUTOPURGE_ADMIN_SUBJECT, $msg);
-		}
+		SEND_ADMIN_NOTIFICATION(AUTOPURGE_ADMIN_SUBJECT, "admin_autopurge_points", TRANSLATE_COMMA($points), "0");
 	}
 }
 
@@ -207,7 +199,7 @@ ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__);
 			SEND_EMAIL($email, AUTOPURGE_MEMBER_INACTIVE_SUBJECT, $msg);
 
 			// Update this account
-			$result_update = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET ap_notified=UNIX_TIMESTAMP() WHERE userid=%d LIMIT 1",
+			$result_update = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET ap_notified=UNIX_TIMESTAMP() WHERE userid=%s LIMIT 1",
 			 array(bigintval($uid)), __FILE__, __LINE__);
 		}
 
@@ -215,15 +207,7 @@ ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__);
 		$UIDs = str_replace(", ", "\n", substr($UIDs, 0, -2));
 
 		// Send mail notification to admin
-		if (GET_EXT_VERSION("admins") >= "0.4.1")
-		{
-			SEND_ADMIN_EMAILS_PRO(AUTOPURGE_ADMIN_INACTIVE_SUBJECT, "admin_autopurge_inactive", $UIDs, "");
-		}
-		 else
-		{
-			$msg = LOAD_EMAIL_TEMPLATE("admin_autopurge_inactive", $UIDs, "");
-			SEND_ADMIN_EMAILS(AUTOPURGE_ADMIN_INACTIVE_SUBJECT, $msg);
-		}
+		SEND_ADMIN_NOTIFICATION(AUTOPURGE_ADMIN_INACTIVE_SUBJECT, "admin_autopurge_inactive", $UIDs, "");
 	}
 
 	// Free memory
@@ -262,15 +246,7 @@ ORDER BY userid",
 		// Send mail notification to admin
 		if ($_CONFIG['ap_un_mail'] == "Y")
 		{
-			if (GET_EXT_VERSION("admins") >= "0.4.1")
-			{
-				SEND_ADMIN_EMAILS_PRO(AUTOPURGE_ADMIN_DELETE_SUBJECT, "admin_autopurge_delete", $UIDs, "");
-			}
-			 else
-			{
-				$msg = LOAD_EMAIL_TEMPLATE("admin_autopurge_delete", $UIDs, "");
-				SEND_ADMIN_EMAILS(AUTOPURGE_ADMIN_DELETE_SUBJECT, $msg);
-			}
+			SEND_ADMIN_NOTIFICATION(AUTOPURGE_ADMIN_DELETE_SUBJECT, "admin_autopurge_delete", $UIDs, "");
 		}
 	}
 
@@ -310,15 +286,7 @@ if ($_CONFIG['ap_unconfirmed'] == "Y")
 		// Send mail notification to admin
 		if ($_CONFIG['ap_un_mail'] == "Y")
 		{
-			if (GET_EXT_VERSION("admins") >= "0.4.1")
-			{
-				SEND_ADMIN_EMAILS_PRO(AUTOPURGE_ADMIN_UNCONFIRMED_SUBJECT, "admin_autopurge_unconfirmed", $UIDs, "");
-			}
-			 else
-			{
-				$msg = LOAD_EMAIL_TEMPLATE("admin_autopurge_unconfirmed", $UIDs, "");
-				SEND_ADMIN_EMAILS(AUTOPURGE_ADMIN_UNCONFIRMED_SUBJECT, $msg);
-			}
+			SEND_ADMIN_NOTIFICATION(AUTOPURGE_ADMIN_UNCONFIRMED_SUBJECT, "admin_autopurge_unconfirmed", $UIDs, "");
 		}
 	}
 
@@ -338,21 +306,12 @@ if ((GET_EXT_VERSION("task") > "0.0") && ($_CONFIG['ap_tasks'] == "Y"))
 	if (($DELETED > 0) && ($_CONFIG['ap_tasks_mail'] == "Y"))
 	{
 		// Send out email to admin
-		if (GET_EXT_VERSION("admins") >= "0.4.1")
-		{
-			SEND_ADMIN_EMAILS_PRO(AUTOPURGE_ADMIN_TASKS_SUBJECT, "admin_autopurge_tsks", $DELETED, "");
-		}
-		 else
-		{
-			$msg = LOAD_EMAIL_TEMPLATE("admin_autopurge_tsks", $DELETED, "");
-			SEND_ADMIN_EMAILS(AUTOPURGE_ADMIN_TASKS_SUBJECT, $msg);
-		}
+		SEND_ADMIN_NOTIFICATION(AUTOPURGE_ADMIN_TASKS_SUBJECT, "admin_autopurge_tsks", $DELETED, "");
 	}
 }
 
 // Search for mails from deleted members?
-if ($_CONFIG['ap_del_mails'])
-{
+if ($_CONFIG['ap_del_mails']) {
 	// Okay, let's check for them...
 	$since = bigintval(time() - $_CONFIG['ap_dm_timeout']);
 	$result_mails = SQL_QUERY_ESC("SELECT sender FROM "._MYSQL_PREFIX."_pool WHERE data_type='DELETED' AND timestamp <= %s ORDER BY sender",
@@ -362,17 +321,14 @@ if ($_CONFIG['ap_del_mails'])
 	$DELETED = 0;
 
 	// Do we have "purged" mails?
-	if (SQL_NUMROWS($result_mails) > 0)
-	{
+	if (SQL_NUMROWS($result_mails) > 0) {
 		// Okay, check for their sender's
-		while(list($sender) = SQL_FETCHROW($result_mails))
-		{
+		while(list($sender) = SQL_FETCHROW($result_mails)) {
 			// Check now...
-			$fount = SQL_NUMROWS(SQL_QUERY_ESC("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d LIMIT 1", array(bigintval($sender)), __FILE__, __LINE__));
-			if ($found == 0)
-			{
+			$fount = SQL_NUMROWS(SQL_QUERY_ESC("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1", array(bigintval($sender)), __FILE__, __LINE__));
+			if ($found == 0) {
 				// Okay we found some mails!
-				$result_remove = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_pool WHERE sender=%d",
+				$result_remove = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_pool WHERE sender=%s",
 				 array(bigintval($sender)), __FILE__, __LINE__);
 				$DELETED += SQL_AFFECTEDROWS();
 
@@ -393,17 +349,14 @@ if ($_CONFIG['ap_del_mails'])
 	 array($since), __FILE__, __LINE__);
 
 	// Do we have "purged" mails?
-	if (SQL_NUMROWS($result_mails) > 0)
-	{
+	if (SQL_NUMROWS($result_mails) > 0) {
 		// Okay, check for their sender's
-		while(list($sender) = SQL_FETCHROW($result_mails))
-		{
+		while(list($sender) = SQL_FETCHROW($result_mails)) {
 			// Check now...
-			$found = SQL_NUMROWS(SQL_QUERY_ESC("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d LIMIT 1", array(bigintval($sender)), __FILE__, __LINE__));
-			if ($found == 0)
-			{
+			$found = SQL_NUMROWS(SQL_QUERY_ESC("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1", array(bigintval($sender)), __FILE__, __LINE__));
+			if ($found == 0) {
 				// Okay we found some mails!
-				$result_remove = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_stats WHERE sender=%d", array(bigintval($sender)), __FILE__, __LINE__);
+				$result_remove = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_stats WHERE sender=%s", array(bigintval($sender)), __FILE__, __LINE__);
 				$DELETED += SQL_AFFECTEDROWS();
 
 				// Reset query (to prevent possible errors) ...
@@ -418,33 +371,23 @@ if ($_CONFIG['ap_del_mails'])
 	SQL_FREERESULT($result_mails);
 
 	// Do we have deleted mails and the admin want's to receive a notification
-	if (($DELETED > 0) && ($_CONFIG['ap_dm_notify'] == "Y"))
-	{
+	if (($DELETED > 0) && ($_CONFIG['ap_dm_notify'] == "Y")) {
 		// Send out email to admin
-		if (GET_EXT_VERSION("admins") >= "0.4.1")
-		{
-			SEND_ADMIN_EMAILS_PRO(AUTOPURGE_ADMIN_DEL_MAILS_SUBJECT, "admin_autopurge_del_mails", $DELETED, "");
-		}
-		 else
-		{
-			$msg = LOAD_EMAIL_TEMPLATE("admin_autopurge_del_mails", $DELETED, "");
-			SEND_ADMIN_EMAILS(AUTOPURGE_ADMIN_DEL_MAILS_SUBJECT, $msg);
-		}
+		SEND_ADMIN_NOTIFICATION(AUTOPURGE_ADMIN_DEL_MAILS_SUBJECT, "admin_autopurge_del_mails", $DELETED, "");
 	}
 }
 
-if (EXT_IS_ACTIVE("rallye"))
-{
+if (EXT_IS_ACTIVE("rallye")) {
 	// Check expired rallyes (hard-coded 3 days limit for displaying expired rallyes!)
 	require_once(PATH."inc/libs/rallye_functions.php");
 	RALLYE_DELETE_EXPIRED_RALLYES();
 }
-//
-if (EXT_IS_ACTIVE("bonus"))
-{
+
+if (EXT_IS_ACTIVE("bonus")) {
 	// Check for expired turbo bonus lines
 	require_once(PATH."inc/libs/bonus_functions.php");
 	BONUS_PURGE_EXPIRED_TURBO_BONUS();
 }
+
 //
 ?>