mailer project continued:

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

diff --git a/inc/purge/purge-inact.php b/inc/purge/purge-inact.php
index 6786cb171482ee38032d5f91ddb456fccab3d239..d9278d309ca8a53b4fac8d39e337e12176bad718 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 *
@@ -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);
@@ -110,7 +111,7 @@ ORDER BY
                } // END - while
 
                // Remove last comma
-               $useridsContent = implode("\n", $userids);
+               $useridsContent = implode(chr(10), $userids);
 
                // Send mail notification to admin
                sendAdminNotification('{--ADMIN_AUTOPURGE_INACTIVE_SUBJECT--}', 'admin_autopurge_inactive', $useridsContent);
@@ -128,7 +129,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 +146,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 +156,7 @@ ORDER BY
                } // END - while
 
                // Display all userids
-               $useridsContent = implode("\n", $userids);
+               $useridsContent = implode(chr(10), $userids);
 
                // Send mail notification to admin
                if (getConfig('ap_in_notify') == 'Y') {