More queries now depends on UNIX_TIMESTAMP() SQL function, wrong index in autopurge...

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

diff --git a/inc/libs/transfer_functions.php b/inc/libs/transfer_functions.php
index be519243692cf5cb68dea23f5d059afb9284211f..f8b65f32bdc96e50a311abaac83dd3b3e90ec860 100644 (file)
--- a/inc/libs/transfer_functions.php
+++ b/inc/libs/transfer_functions.php
@@ -32,28 +32,26 @@
  ************************************************************************/
 
 // Some security stuff...
  ************************************************************************/
 
 // Some security stuff...

-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {

        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }

+

 //
 //

-function TRANSFER_AUTPPURGE($max, $age)
-{
+function TRANSFER_AUTPPURGE($max, $age) {

        // First get total in-going lines
        $result = SQL_QUERY("SELECT id FROM "._MYSQL_PREFIX."_user_transfers_in ORDER BY id", __FILE__, __LINE__);
        // First get total in-going lines
        $result = SQL_QUERY("SELECT id FROM "._MYSQL_PREFIX."_user_transfers_in ORDER BY id", __FILE__, __LINE__);

-       if (SQL_NUMROWS($result) > $max)
-       {
+       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, __FILE__, __LINE__);
        }
                // 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, __FILE__, __LINE__);
        }

+

        // Second get total out-going lines
        $result = SQL_QUERY("SELECT id FROM "._MYSQL_PREFIX."_user_transfers_out ORDER BY id", __FILE__, __LINE__);
        // Second get total out-going lines
        $result = SQL_QUERY("SELECT id FROM "._MYSQL_PREFIX."_user_transfers_out ORDER BY id", __FILE__, __LINE__);

-       if (SQL_NUMROWS($result) > $max)
-       {
+       if (SQL_NUMROWS($result) > $max) {

                // Update overdue transfers
                $remove = SQL_NUMROWS($result) - $max;
 
                // Update overdue transfers
                $remove = SQL_NUMROWS($result) - $max;
 


@@ -62,11 +60,11 @@ function TRANSFER_AUTPPURGE($max, $age)
        }
 
        // Remove old in-going transfers
        }
 
        // Remove old in-going transfers

-       $result = SQL_QUERY("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_transfers_in WHERE time_trans < ".(time() - $age), __FILE__, __LINE__);
+       $result = SQL_QUERY("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_transfers_in WHERE time_trans < (UNIX_TIMESTAMP() - ".$age.")", __FILE__, __LINE__);

        $REMOVE = SQL_AFFECTEDROWS();
 
        // Remove old out-going transfers
        $REMOVE = SQL_AFFECTEDROWS();
 
        // Remove old out-going transfers

-       $result = SQL_QUERY("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_transfers_out WHERE time_trans < ".(time() - $age), __FILE__, __LINE__);
+       $result = SQL_QUERY("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_transfers_out WHERE time_trans < (UNIX_TIMESTAMP() - ".$age.")", __FILE__, __LINE__);

        $REMOVE += SQL_AFFECTEDROWS();
 
        // Only send email to admin(s) when we have removed entries
        $REMOVE += SQL_AFFECTEDROWS();
 
        // Only send email to admin(s) when we have removed entries