Added more logging of half-failed AJAX requests

[mailer.git] / inc / purge / purge-inact.php

diff --git a/inc/purge/purge-inact.php b/inc/purge/purge-inact.php
index 6786cb171482ee38032d5f91ddb456fccab3d239..e7472ef2117f1107daaf1a9e48a6368bd9979d8b 100644 (file)
--- a/inc/purge/purge-inact.php
+++ b/inc/purge/purge-inact.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 // Abort if autopurge is not active or disabled by admin
 if ((!isExtensionActive('autopurge')) || (!isAutoPurgingActive())) {
        // Abort here
-       return false;
+       return FALSE;
 } // END - if
 
 // Shall I look for inactive accounts and autopurge inactive accounts?
@@ -54,7 +54,7 @@ if (isAutopurgeInactiveEnabled()) {
        // Init exclusion list
        // @TODO Rewrite these if() blocks to a filter
        $excludeUserids = '';
-       if (isValidUserId(getDefRefid())) $excludeUserids .= ' AND `userid` != {?def_refid?}';
+       if (isValidId(getDefRefid())) $excludeUserids .= ' AND `userid` != {?def_refid?}';
 
        // Check for more extensions
        if (isExtensionActive('beg'))     $excludeUserids .= ' AND `userid` != {?beg_userid?}';
@@ -75,7 +75,8 @@ if (isAutopurgeInactiveEnabled()) {
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
-       `status`='CONFIRMED' AND
+       `status`='CONFIRMED'
+       " . runFilterChain('user_exclusion_sql', ' ') . " AND
        (UNIX_TIMESTAMP() - `joined`) >= {?ap_inactive_since?} AND
        (UNIX_TIMESTAMP() - `last_online`) >= {?ap_inactive_since?} AND
        (UNIX_TIMESTAMP() - `ap_notified`) >= {?ap_inactive_since?}
@@ -95,7 +96,7 @@ ORDER BY
                        $content = merge_array($content, $row);
 
                        // Remember userids for the admin
-                       $userids[] = $content['userid'];
+                       array_push($userids, $content['userid']);
 
                        // Get date/time from timestamp
                        $content['last_online'] = generateDateTime($content['last_online'], 0);
@@ -106,21 +107,24 @@ ORDER BY
 
                        // Update this account
                        addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `ap_notified`=UNIX_TIMESTAMP() WHERE `userid`=%s LIMIT 1",
-                               array(bigintval($content['userid'])), __FILE__, __LINE__, false));
+                               array(bigintval($content['userid'])), __FILE__, __LINE__, FALSE));
                } // END - while
 
                // Remove last comma
-               $useridsContent = implode("\n", $userids);
+               $content['userids'] = implode(PHP_EOL, $userids);
 
                // Send mail notification to admin
-               sendAdminNotification('{--ADMIN_AUTOPURGE_INACTIVE_SUBJECT--}', 'admin_autopurge_inactive', $useridsContent);
+               sendAdminNotification('{--ADMIN_AUTOPURGE_INACTIVE_SUBJECT--}', 'admin_autopurge_inactive', $content);
        } // END - if
 
        // Free memory
        SQL_FREERESULT($result_inactive);
 
-       // Now let's have a look for inactive accounts we want to delete we newly use the same exclude list
-       // here for e.g. excluding holiday users
+       /*
+        * Now let's have a look for inactive accounts for deletion. Use the newly
+        * added exclude list here for e.g. excluding holiday users, test users et
+        * cetera.
+        */
        $result_inactive = SQL_QUERY("SELECT
        `userid`,
        `email`,
@@ -128,7 +132,8 @@ ORDER BY
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
-       `status`='CONFIRMED' AND
+       `status`='CONFIRMED'
+       " . runFilterChain('user_exclusion_sql', ' ') . " AND
        (UNIX_TIMESTAMP() - `joined`) >= {?ap_inactive_since?} AND
        (UNIX_TIMESTAMP() - `last_online`) >= {?ap_inactive_since?} AND
        (UNIX_TIMESTAMP() - `ap_notified`) >= {?ap_inactive_time?} AND
@@ -144,7 +149,7 @@ ORDER BY
                // Delete inactive accounts
                while ($content = SQL_FETCHARRAY($result_inactive)) {
                        // Remember userids for the admin
-                       $userids[] = $content['userid'];
+                       array_push($userids, $content['userid']);
 
                        // Get date/time from timestamp
                        $content['last_online'] = generateDateTime($content['last_online'], 0);
@@ -154,7 +159,7 @@ ORDER BY
                } // END - while
 
                // Display all userids
-               $useridsContent = implode("\n", $userids);
+               $useridsContent = implode(PHP_EOL, $userids);
 
                // Send mail notification to admin
                if (getConfig('ap_in_notify') == 'Y') {