Some SQLs rewritten, unneccessary parameter removed

[mailer.git] / inc / libs / transfer_functions.php

diff --git a/inc/libs/transfer_functions.php b/inc/libs/transfer_functions.php
index 54b7a17a90ac104a4bd73b7b213f337ebd6c96eb..c61e7a6e5fd2b4752714aab722ff15bc0e964a3c 100644 (file)
--- a/inc/libs/transfer_functions.php
+++ b/inc/libs/transfer_functions.php
@@ -39,42 +39,47 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-}
+} // END - if
 
-//
-function autoPurgeTransfers($max, $age) {
+// Purge expired transfer entries
+function autoPurgeTransfers ($max, $age) {
        // First get total in-going lines
-       $result = SQL_QUERY("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_transfers_in` ORDER BY `id`", __FUNCTION__, __LINE__);
+       $result = SQL_QUERY("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_transfers_in` ORDER BY `id` ASC", __FUNCTION__, __LINE__);
        if (SQL_NUMROWS($result) > $max) {
                // Update overdue transfers
                $remove = SQL_NUMROWS($result) - $max;
 
                // This will make it really old, so the final removal query will find it
-               $result = SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_user_transfers_in` SET `time_trans`=0 ORDER BY `id` LIMIT ".$remove, __FUNCTION__, __LINE__);
-       }
+               $result = SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_transfers_in` SET `time_trans`=0 ORDER BY `id` LIMIT %s"
+                       array($remove), __FUNCTION__, __LINE__);
+       } // END - if
 
        // Second get total out-going lines
-       $result = SQL_QUERY("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_transfers_out` ORDER BY `id`", __FUNCTION__, __LINE__);
+       $result = SQL_QUERY("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_transfers_out` ORDER BY `id` ASC", __FUNCTION__, __LINE__);
        if (SQL_NUMROWS($result) > $max) {
                // Update overdue transfers
                $remove = SQL_NUMROWS($result) - $max;
 
                // This will make it really old, so the final removal query will find it
-               $result = SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_user_transfers_out` SET `time_trans`=0 ORDER BY `id` LIMIT ".$remove, __FUNCTION__, __LINE__);
-       }
+               $result = SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_transfers_out` SET `time_trans`=0 ORDER BY `id` LIMIT %s"
+                       array($remove), __FUNCTION__, __LINE__);
+       } // END - if
 
        // Remove old in-going transfers
-       $result = SQL_QUERY("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_transfers_in` WHERE time_trans < (UNIX_TIMESTAMP() - ".$age.")", __FUNCTION__, __LINE__);
-       $REMOVE = SQL_AFFECTEDROWS();
+       $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_transfers_in` WHERE `time_trans` < (UNIX_TIMESTAMP() - %s)",
+               array($age), __FUNCTION__, __LINE__);
+       $removed = SQL_AFFECTEDROWS();
 
        // Remove old out-going transfers
-       $result = SQL_QUERY("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_transfers_out` WHERE time_trans < (UNIX_TIMESTAMP() - ".$age.")", __FUNCTION__, __LINE__);
-       $REMOVE += SQL_AFFECTEDROWS();
+       $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_transfers_out` WHERE `time_trans` < (UNIX_TIMESTAMP() - %s)",
+               array($age), __FUNCTION__, __LINE__);
+       $removed += SQL_AFFECTEDROWS();
 
        // Only send email to admin(s) when we have removed entries
-       if ($REMOVE > 0) {
-               sendAdminNotification(TRANSFER_ADMIN_AUTOPURGE, "admin_transfer_ap", $REMOVE, 0);
-       }
+       if ($removed > 0) {
+               sendAdminNotification(getMessage('TRANSFER_ADMIN_AUTOPURGE'), 'admin_transfer_ap', $removed);
+       } // END - if
 }
-//
+
+// [EOF]
 ?>