X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fautopurge%2Fpurge-mails.php;h=795e2d1fb7495a91dae8c34239f20458c97897c3;hb=3767eef30a9e514e95625e6da22418ab297b204d;hp=a6ab6e20e7b502939f51bddf4e0349c01943e2bd;hpb=971a60aaee17e6fc376b433f3f5763c85a512110;p=mailer.git diff --git a/inc/autopurge/purge-mails.php b/inc/autopurge/purge-mails.php index a6ab6e20e7..795e2d1fb7 100644 --- a/inc/autopurge/purge-mails.php +++ b/inc/autopurge/purge-mails.php @@ -1,7 +1,7 @@ 0) { - // Okay, check for their sender's - while ($content = SQL_FETCHARRAY($result_mails)) { - // Check now... - $fount = SQL_NUMROWS(SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1", - array(bigintval($content['sender'])), __FILE__, __LINE__)); - if ($found == 0) { - // Okay we found some mails! - SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_pool` WHERE `sender`=%s", - array(bigintval($content['sender'])), __FILE__, __LINE__); - $DELETED += SQL_AFFECTEDROWS(); +// Do we have "purged" mails? +if (!SQL_HASZERONUMS($result_mails)) { + // Okay, check for their sender's + while ($content = SQL_FETCHARRAY($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", + array(bigintval($content['sender'])), __FILE__, __LINE__); - // Reset query (to prevent possible errors) ...; - $result_mails = SQL_QUERY_ESC("SELECT `sender` -FROM `{!_MYSQL_PREFIX!}_pool` -WHERE `data_type`='DELETED' AND timestamp <= (UNIX_TIMESTAMP() - %s) -ORDER BY `sender` ASC", - array(getConfig('ap_dm_timeout')), __FILE__, __LINE__); - } - } - } + // Get all affected (deleted) rows + $deletedStats += SQL_AFFECTEDROWS(); - // Free memory - SQL_FREERESULT($result_mails); + // Reset query (to prevent possible errors) ...; + $result_mails = SQL_QUERY("SELECT + `sender` +FROM + `{?_MYSQL_PREFIX?}_pool` +WHERE + `data_type`='DELETED' AND + `timestamp` <= (UNIX_TIMESTAMP() - {?ap_dm_timeout?}) +ORDER BY + `sender` ASC", __FILE__, __LINE__); + } // END - if + } // END - while +} // END - if + +// Free memory +SQL_FREERESULT($result_mails); - // Now let's check for stats entries as well; - $result_mails = SQL_QUERY_ESC("SELECT `sender` -FROM `{!_MYSQL_PREFIX!}_user_stats` -WHERE `data_type`='DELETED' AND `timestamp_send` <= (UNIX_TIMESTAMP() - %s) -ORDER BY `sender` ASC", - array(getConfig('ap_dm_timeout')), __FILE__, __LINE__); +// Now let's check for stats entries as well; +$result_mails = SQL_QUERY("SELECT + `userid` AS sender +FROM + `{?_MYSQL_PREFIX?}_user_stats` +WHERE + `timestamp_send` <= (UNIX_TIMESTAMP() - {?ap_dm_timeout?}) +ORDER BY + `userid` ASC", __FILE__, __LINE__); - // Do we have "purged" mails? - if (SQL_NUMROWS($result_mails) > 0) { - // Okay, check for their sender's - while ($content = SQL_FETCHARRAY($result_mails)) { - // Check now... - $found = SQL_NUMROWS(SQL_QUERY_ESC("SELECT `userid` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1", - array(bigintval($content['sender'])), __FILE__, __LINE__)); - if ($found == 0) { - // Okay we found some mails! - SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE `sender`=%s", - array(bigintval($content['sender'])), __FILE__, __LINE__); - $DELETED += SQL_AFFECTEDROWS(); +// Do we have "purged" mails? +if (!SQL_HASZERONUMS($result_mails)) { + // Okay, check for their sender's + while ($content = SQL_FETCHARRAY($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", + array(bigintval($content['userid'])), __FILE__, __LINE__); - // Reset query (to prevent possible errors) ... - $result_mails = SQL_QUERY_ESC("SELECT `sender` -FROM `{!_MYSQL_PREFIX!}_user_stats` -WHERE `data_type`='DELETED' AND timestamp_send <= (UNIX_TIMESTAMP() - %s) -ORDER BY `sender` ASC", - array(getConfig('ap_dm_timeout')), __FILE__, __LINE__); - } - } - } + // Get all affected (deleted) rows + $deletedStats += SQL_AFFECTEDROWS(); - // Free memory - SQL_FREERESULT($result_mails); + // Reset query (to prevent possible errors) ... + $result_mails = SQL_QUERY("SELECT + `userid` +FROM + `{?_MYSQL_PREFIX?}_user_stats` +WHERE + `timestamp_send` <= (UNIX_TIMESTAMP() - {?ap_dm_timeout?}) +ORDER BY + `userid` ASC", __FILE__, __LINE__); + } // END - if + } // END - while +} // END - if - // Do we have deleted mails and the admin want's to receive a notification - if (($DELETED > 0) && (getConfig('ap_dm_notify') == 'Y')) { - // Send out email to admin - sendAdminNotification(getMessage('AUTOPURGE_ADMIN_DEL_MAILS_SUBJECT'), 'admin_autopurge_del_mails', $DELETED, ''); - } // END - if -} +// Free memory +SQL_FREERESULT($result_mails); + +// Do we have 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); +} // END - if -// +// [EOF] ?>