Fixes to HTTP functions to return proper HTTP body and headers:

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

diff --git a/inc/purge/purge-inact.php b/inc/purge/purge-inact.php
index d9278d309ca8a53b4fac8d39e337e12176bad718..e7472ef2117f1107daaf1a9e48a6368bd9979d8b 100644 (file)
--- a/inc/purge/purge-inact.php
+++ b/inc/purge/purge-inact.php
@@ -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?}';
@@ -107,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(chr(10), $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`,
@@ -156,7 +159,7 @@ ORDER BY
                } // END - while
 
                // Display all userids
-               $useridsContent = implode(chr(10), $userids);
+               $useridsContent = implode(PHP_EOL, $userids);
 
                // Send mail notification to admin
                if (getConfig('ap_in_notify') == 'Y') {