Ref link fixed, nickname fixed, several rewrites, TODOs.txt updated:

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

diff --git a/inc/autopurge/purge-inact.php b/inc/autopurge/purge-inact.php
index 9d630b20583f9ef5374fcf727425bc4eb81c6519..4145d9a3e65f46b62873e8831376b767f2e9515f 100644 (file)
--- a/inc/autopurge/purge-inact.php
+++ b/inc/autopurge/purge-inact.php
@@ -53,9 +53,6 @@ if (getConfig('autopurge_inactive') == 'Y') {
        // Init SQLs
        INIT_SQLS();
 
-       // Ok, let's have a look...
-       $since = getConfig(('ap_inactive_since'));
-
        // Init exclusion list
        $EXCLUDE_LIST = '';
        if (getConfig('def_refid') > 0) {
@@ -70,7 +67,7 @@ if (getConfig('autopurge_inactive') == 'Y') {
        // Check for new holiday extension
        if (GET_EXT_VERSION('holiday') >= '0.1.3') {
                // Include only users with no active holiday
-               $EXCLUDE_LIST .= " AND d.holiday_active='N'";
+               $EXCLUDE_LIST .= " AND d.`holiday_active`='N'";
        } // END - if
 
        // Check for all accounts
@@ -78,7 +75,12 @@ if (getConfig('autopurge_inactive') == 'Y') {
 FROM `{!_MYSQL_PREFIX!}_user_data` AS d
 WHERE d.`status`='CONFIRMED' AND d.joined < (UNIX_TIMESTAMP() - %s) AND d.last_online < (UNIX_TIMESTAMP() - %s) AND d.ap_notified < (UNIX_TIMESTAMP() - %s)
 ".$EXCLUDE_LIST."
-ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__);
+ORDER BY d.userid",
+               array(,
+                       getConfig('ap_inactive_since'),
+                       getConfig('ap_inactive_since'),
+                       getConfig('ap_inactive_since')
+               ), __FILE__, __LINE__);
 
        if (SQL_NUMROWS($result_inactive) > 0) {
                // Prepare variables and constants...
@@ -92,14 +94,14 @@ ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__);
                        $UIDs .= $content['userid'].", ";
 
                        // Get date/time from timestamp
-                       $content['last_online'] = MAKE_DATETIME($content['last_online'], "0");
+                       $content['last_online'] = generateDateTime($content['last_online'], '0');
 
                        // Load mail template
-                       $msg = LOAD_EMAIL_TEMPLATE("member_autopurge_inactive", $content['last_online'], bigintval($content['userid']));
-                       SEND_EMAIL($content['email'], getMessage('AUTOPURGE_MEMBER_INACTIVE_SUBJECT'), $msg);
+                       $message = LOAD_EMAIL_TEMPLATE("member_autopurge_inactive", $content['last_online'], bigintval($content['userid']));
+                       sendEmail($content['email'], getMessage('AUTOPURGE_MEMBER_INACTIVE_SUBJECT'), $message);
 
                        // Update this account
-                       ADD_SQL(SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET ap_notified=UNIX_TIMESTAMP() WHERE userid=%s LIMIT 1",
+                       ADD_SQL(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));
                } // END - while
 
@@ -107,7 +109,7 @@ ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__);
                $UIDs = str_replace(", ", "\n", substr($UIDs, 0, -2));
 
                // Send mail notification to admin
-               SEND_ADMIN_NOTIFICATION(getMessage('AUTOPURGE_ADMIN_INACTIVE_SUBJECT'), "admin_autopurge_inactive", $UIDs, '');
+               sendAdminNotification(getMessage('AUTOPURGE_ADMIN_INACTIVE_SUBJECT'), 'admin_autopurge_inactive', $UIDs, '');
        } // END - if
 
        // Free memory
@@ -115,13 +117,17 @@ ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__);
 
        // 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
-       $time = getConfig(('ap_in_time'));
        $result_inactive = SQL_QUERY_ESC("SELECT d.userid, d.email, d.last_online
 FROM `{!_MYSQL_PREFIX!}_user_data` AS d
-WHERE `status`='CONFIRMED' AND joined < (UNIX_TIMESTAMP() - %s) AND last_online < (UNIX_TIMESTAMP() - %s) AND ap_notified < (UNIX_TIMESTAMP() - %s)
+WHERE `status`='CONFIRMED' AND `joined` < (UNIX_TIMESTAMP() - %s) AND `last_online` < (UNIX_TIMESTAMP() - %s) AND `ap_notified` < (UNIX_TIMESTAMP() - %s)
 ".$EXCLUDE_LIST."
-ORDER BY userid",
-               array($since, $since, $time), __FILE__, __LINE__);
+ORDER BY `userid` ASC",
+               array(
+                       getConfig('ap_inactive_since'),
+                       getConfig('ap_inactive_since'),
+                       getConfig('ap_in_time')
+               ), __FILE__, __LINE__);
+
        if (SQL_NUMROWS($result_inactive) > 0) {
                // Prepare variable...
                $UIDs = '';
@@ -129,13 +135,13 @@ ORDER BY userid",
                // Delete inactive accounts
                while ($content = SQL_FETCHARRAY($result_inactive)) {
                        // Remember userids for the admin
-                       $UIDs .= $content['userid'].", ";
+                       $UIDs .= $content['userid'] . ', ';
 
                        // Get date/time from timestamp
-                       $content['last_online'] = MAKE_DATETIME($content['last_online'], "0");
+                       $content['last_online'] = generateDateTime($content['last_online'], '0');
 
                        // Finnaly delete this inactive account
-                       DELETE_USER_ACCOUNT($content['userid'], LOAD_EMAIL_TEMPLATE("member_autopurge_delete", $content['last_online'], ''));
+                       deleteUserAccount($content['userid'], LOAD_EMAIL_TEMPLATE('member_autopurge_delete', $content['last_online'], ''));
                } // END - while
 
                // Remove last comma
@@ -143,7 +149,7 @@ ORDER BY userid",
 
                // Send mail notification to admin
                if (getConfig('ap_in_notify') == 'Y') {
-                       SEND_ADMIN_NOTIFICATION(getMessage('AUTOPURGE_ADMIN_DELETE_SUBJECT'), "admin_autopurge_delete", $UIDs, '');
+                       sendAdminNotification(getMessage('AUTOPURGE_ADMIN_DELETE_SUBJECT'), 'admin_autopurge_delete', $UIDs, '');
                } // END - if
        } // END - if