* $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
* $Author:: $ *
- * Needs to be in all Files and every File needs "svn propset *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
* Copyright (c) 2009, 2010 by Mailer Developer Team *
} // END - if
// Abort if autopurge is not active or disabled by admin
-if ((!isExtensionActive('autopurge')) || (getConfig('auto_purge_active') != 'Y') || (getConfig('ap_del_mails') != 'Y')) {
+if ((!isExtensionActive('autopurge')) || (!isAutoPurgingActive()) || (getConfig('ap_del_mails') != 'Y')) {
// Abort here
return false;
} // END - if
FROM
`{?_MYSQL_PREFIX?}_pool`
WHERE
- `data_type`='DELETED' AND `timestamp` <= (UNIX_TIMESTAMP() - {?ap_dm_timeout?})
+ `data_type`='DELETED' AND
+ `timestamp` <= (UNIX_TIMESTAMP() - {?ap_dm_timeout?})
ORDER BY
`sender` ASC", __FILE__, __LINE__);
$deletedStats = '0';
// Do we have "purged" mails?
-if (SQL_NUMROWS($result_mails) > 0) {
+if (!SQL_HASZERONUMS($result_mails)) {
// Okay, check for their sender's
while ($content = SQL_FETCHARRAY($result_mails)) {
// Check now...
FROM
`{?_MYSQL_PREFIX?}_pool`
WHERE
- `data_type`='DELETED' AND timestamp <= (UNIX_TIMESTAMP() - {?ap_dm_timeout?})
+ `data_type`='DELETED' AND
+ `timestamp` <= (UNIX_TIMESTAMP() - {?ap_dm_timeout?})
ORDER BY
`sender` ASC", __FILE__, __LINE__);
} // END - if
// Now let's check for stats entries as well;
$result_mails = SQL_QUERY("SELECT
- `userid` AS sender
+ `userid` AS `sender`
FROM
`{?_MYSQL_PREFIX?}_user_stats`
WHERE
`timestamp_send` <= (UNIX_TIMESTAMP() - {?ap_dm_timeout?})
ORDER BY
- `sender` ASC", __FILE__, __LINE__);
+ `userid` ASC", __FILE__, __LINE__);
// Do we have "purged" mails?
-if (SQL_NUMROWS($result_mails) > 0) {
+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 `sender`=%s",
+ SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `userid`=%s",
array(bigintval($content['sender'])), __FILE__, __LINE__);
// Get all affected (deleted) rows
// Reset query (to prevent possible errors) ...
$result_mails = SQL_QUERY("SELECT
- `userid` AS sender
+ `userid`
FROM
`{?_MYSQL_PREFIX?}_user_stats`
WHERE
`timestamp_send` <= (UNIX_TIMESTAMP() - {?ap_dm_timeout?})
ORDER BY
- `sender` ASC", __FILE__, __LINE__);
+ `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 (($deletedStats > 0) && (getConfig('ap_dm_notify') == 'Y')) {
// Send out email to admin
- sendAdminNotification(getMessage('AUTOPURGE_ADMIN_DEL_MAILS_SUBJECT'), 'admin_autopurge_del_mails', $deletedStats);
+ sendAdminNotification('{--ADMIN_AUTOPURGE_DELETE_MAILS_SUBJECT--}', 'admin_autopurge_del_mails', $deletedStats);
} // END - if
-//
+// [EOF]
?>