X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fautopurge%2Fpurge-mails.php;h=a2f0ade9a93c4c581c64c3848b3dcc1d1051e81d;hb=067dc339f4058c7834f5e5d2f7d8d44ce6d7cea3;hp=c4e1222edaccef9d5239ec2bc40859dd21e626d0;hpb=414570c5081d337bb6c28dcf521bd8bca02f69e7;p=mailer.git diff --git a/inc/autopurge/purge-mails.php b/inc/autopurge/purge-mails.php index c4e1222eda..a2f0ade9a9 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_NUMROWS($result_mails) > 0) { + // 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__); + $DELETED += SQL_AFFECTEDROWS(); - // Reset query (to prevent possible errors) ... - $since = getConfig(('ap_dm_timeout')); - $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($since), __FILE__, __LINE__); - } - } - } + // 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); +// Free memory +SQL_FREERESULT($result_mails); - // Now let's check for stats entries as well - $since = getConfig(('ap_dm_timeout')); - $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($since), __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 + `sender` 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_NUMROWS($result_mails) > 0) { + // 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 `sender`=%s", + array(bigintval($content['sender'])), __FILE__, __LINE__); + $DELETED += SQL_AFFECTEDROWS(); - // Reset query (to prevent possible errors) ... - $since = getConfig(('ap_dm_timeout')); - $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($since), __FILE__, __LINE__); - } - } - } + // Reset query (to prevent possible errors) ... + $result_mails = SQL_QUERY("SELECT + `userid` AS sender +FROM + `{?_MYSQL_PREFIX?}_user_stats` +WHERE + `timestamp_send` <= (UNIX_TIMESTAMP() - {?ap_dm_timeout?}) +ORDER BY + `sender` ASC", __FILE__, __LINE__); + } // END - if + } // END - while +} // END - if - // Free memory - SQL_FREERESULT($result_mails); +// Free memory +SQL_FREERESULT($result_mails); - // 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 - SEND_ADMIN_NOTIFICATION(getMessage('AUTOPURGE_ADMIN_DEL_MAILS_SUBJECT'), "admin_autopurge_del_mails", $DELETED, ""); - } // 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 // ?>