X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fpurge%2Fpurge-mails.php;h=60a9651eca4165cc580cd24d06c4fd19d2de4df1;hp=7e830feb8a6c580faf024913158466a5b8f19175;hb=49acdb7a7adbcf25a8e8683b5581bfcec72b23bd;hpb=8fad776382e63b3f73f8dbe289f229d79cfc2c22

diff --git a/inc/purge/purge-mails.php b/inc/purge/purge-mails.php
index 7e830feb8a..60a9651eca 100644
--- a/inc/purge/purge-mails.php
+++ b/inc/purge/purge-mails.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -43,11 +43,11 @@ if (!defined('__SECURITY')) {
 // Abort if autopurge is not active or disabled by admin
 if ((!isExtensionActive('autopurge')) || (!isAutoPurgingActive()) || (getConfig('ap_del_mails') != 'Y')) {
 	// Abort here
-	return false;
+	return FALSE;
 } // END - if
 
 // Okay, let's check for deleted mails
-$result_mails = SQL_QUERY("SELECT
+$result_mails = sqlQuery("SELECT
 	`sender`
 FROM
 	`{?_MYSQL_PREFIX?}_pool`
@@ -61,26 +61,26 @@ ORDER BY
 $deletedStats = '0';
 
 // Is there "purged" mails?
-if (!SQL_HASZERONUMS($result_mails)) {
+if (!ifSqlHasZeroNumRows($result_mails)) {
 	// Okay, check for their sender's
-	while ($content = SQL_FETCHARRAY($result_mails)) {
+	while ($content = sqlFetchArray($result_mails)) {
 		// Check now...
 		if (!fetchUserData($content['sender'])) {
 			// Okay we found some mails!
-			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_pool` WHERE `sender`=%s",
+			sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_pool` WHERE `sender`=%s",
 				array(bigintval($content['sender'])), __FILE__, __LINE__);
 
 			// Get all affected (deleted) rows
-			$deletedStats += SQL_AFFECTEDROWS();
+			$deletedStats += sqlAffectedRows();
 		} // END - if
 	} // END - while
 } // END - if
 
 // Free memory
-SQL_FREERESULT($result_mails);
+sqlFreeResult($result_mails);
 
 // Now let's check for stats entries as well;
-$result_mails = SQL_QUERY("SELECT
+$result_mails = sqlQuery("SELECT
 	`userid` AS `sender`
 FROM
 	`{?_MYSQL_PREFIX?}_user_stats`
@@ -90,20 +90,20 @@ ORDER BY
 	`userid` ASC", __FILE__, __LINE__);
 
 // Is there "purged" mails?
-if (!SQL_HASZERONUMS($result_mails)) {
+if (!ifSqlHasZeroNumRows($result_mails)) {
 	// Okay, check for their sender's
-	while ($content = SQL_FETCHARRAY($result_mails)) {
+	while ($content = sqlFetchArray($result_mails)) {
 		// Check now...
 		if (!fetchUserData($content['sender'])) {
 			// Okay we found some mails!
-			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `userid`=%s",
+			sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `userid`=%s",
 				array(bigintval($content['sender'])), __FILE__, __LINE__);
 
 			// Get all affected (deleted) rows
-			$deletedStats += SQL_AFFECTEDROWS();
+			$deletedStats += sqlAffectedRows();
 
 			// Reset query (to prevent possible errors) ...
-			$result_mails = SQL_QUERY("SELECT
+			$result_mails = sqlQuery("SELECT
 	`userid` AS `sender`
 FROM
 	`{?_MYSQL_PREFIX?}_user_stats`
@@ -116,12 +116,12 @@ ORDER BY
 } // END - if
 
 // Free memory
-SQL_FREERESULT($result_mails);
+sqlFreeResult($result_mails);
 
 // Is there deleted mails and the admin want's to receive a notification
 if (($deletedStats > 0) && (getConfig('ap_dm_notify') == 'Y')) {
 	// Send out email to admin
-	sendAdminNotification('{--ADMIN_AUTOPURGE_DELETE_MAILS_SUBJECT--}', 'admin_autopurge_del_mails', $deletedStats);
+	sendAdminNotification('{--ADMIN_AUTOPURGE_DELETE_MAILS_SUBJECT--}', 'admin_purge_del_mails', $deletedStats);
 } // END - if
 
 // [EOF]