Renamed ifSqlHasZeroNums() to ifSqlHasZeroNumRows() and improved some queries.

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

diff --git a/inc/purge/purge-mails.php b/inc/purge/purge-mails.php
index 61f911bdfaeebb8b3a89ce03ac01d6c55f60ed8b..60a9651eca4165cc580cd24d06c4fd19d2de4df1 100644 (file)
--- a/inc/purge/purge-mails.php
+++ b/inc/purge/purge-mails.php
@@ -16,8 +16,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 - 2015 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 *
@@ -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`
@@ -57,41 +57,30 @@ WHERE
 ORDER BY
        `sender` ASC", __FILE__, __LINE__);
 
-// Reset counter...
+// Init counter...
 $deletedStats = '0';
 
-// Do we have "purged" mails?
-if (!SQL_HASZERONUMS($result_mails)) {
+// Is there "purged" 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();
-
-                       // Reset query (to prevent possible errors) ...;
-                       $result_mails = SQL_QUERY("SELECT
-       `sender`
-FROM
-       `{?_MYSQL_PREFIX?}_pool`
-WHERE
-       `data_type`='DELETED' AND
-       (UNIX_TIMESTAMP() - `timestamp`) >= {?ap_dm_timeout?}
-ORDER BY
-       `sender` ASC", __FILE__, __LINE__);
+                       $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`
@@ -100,21 +89,21 @@ WHERE
 ORDER BY
        `userid` ASC", __FILE__, __LINE__);
 
-// Do we have "purged" mails?
-if (!SQL_HASZERONUMS($result_mails)) {
+// Is there "purged" 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`
@@ -127,12 +116,12 @@ ORDER BY
 } // END - if
 
 // Free memory
-SQL_FREERESULT($result_mails);
+sqlFreeResult($result_mails);
 
-// Do we have deleted mails and the admin want's to receive a notification
+// 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]