More debug output added

[mailer.git] / inc / autopurge / purge-unconfirmed.php

diff --git a/inc/autopurge/purge-unconfirmed.php b/inc/autopurge/purge-unconfirmed.php
index 0c6861c389e2683dd9470a0f620357978c9474ef..a31d7b6ef6fa8f76e79cb949c33f16038cd84ce8 100644 (file)
--- a/inc/autopurge/purge-unconfirmed.php
+++ b/inc/autopurge/purge-unconfirmed.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Abort if autopurge is not active or disabled by admin
-if ((!EXT_IS_ACTIVE('autopurge')) || (getConfig('auto_purge_active') != "Y")) {
+if ((!EXT_IS_ACTIVE('autopurge')) || (getConfig('auto_purge_active') != 'Y')) {
        // Abort here
        return false;
 } // END - if
@@ -56,7 +56,7 @@ if (getConfig('autopurge_unconfirmed') == 'Y') {
 FROM `{!_MYSQL_PREFIX!}_user_data`
 WHERE `status`='UNCONFIRMED' AND joined < (UNIX_TIMESTAMP() - %s)
 ORDER BY userid ASC",
-               array($time), __FILE__, __LINE__);
+       array($time), __FILE__, __LINE__);
        if (SQL_NUMROWS($result_uncon) > 0) {
                // Prepare variable...
                $UIDs = '';
@@ -68,10 +68,10 @@ ORDER BY userid ASC",
                        $UIDs .= $content['userid'].", ";
 
                        // Get date/time from timestamp
-                       $content['joined'] = MAKE_DATETIME($content['joined'], "0");
+                       $content['joined'] = generateDateTime($content['joined'], '0');
 
                        // Finnaly delete this inactive account
-                       DELETE_USER_ACCOUNT($content['userid'], LOAD_EMAIL_TEMPLATE("member_autopurge_unconfirmed", $content['joined'], ''));
+                       deleteUserAccount($content['userid'], LOAD_EMAIL_TEMPLATE("member_autopurge_unconfirmed", $content['joined'], ''));
                } // END - while
 
                // Remove last comma
@@ -79,7 +79,7 @@ ORDER BY userid ASC",
 
                // Send mail notification to admin
                if (getConfig('ap_un_notify') == 'Y') {
-                       SEND_ADMIN_NOTIFICATION(getMessage('AUTOPURGE_ADMIN_UNCONFIRMED_SUBJECT'), "admin_autopurge_unconfirmed", $UIDs, '');
+                       sendAdminNotification(getMessage('AUTOPURGE_ADMIN_UNCONFIRMED_SUBJECT'), "admin_autopurge_unconfirmed", $UIDs, '');
                } // END - if
        } // END - if