Naming convention, more usage of EL, new wrapper function introduced:

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

diff --git a/inc/autopurge/purge-inact.php b/inc/autopurge/purge-inact.php
index 652a561e2eeb25704279fcc201844dd6b4618c5c..bca267d2e42650ac6cad19ddb6c65a8943dadc99 100644 (file)
--- a/inc/autopurge/purge-inact.php
+++ b/inc/autopurge/purge-inact.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -42,7 +43,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Abort if autopurge is not active or disabled by admin
-if ((!isExtensionActive('autopurge')) || (getConfig('auto_purge_active') != 'Y')) {
+if ((!isExtensionActive('autopurge')) || (!isAutoPurgingActive())) {
        // Abort here
        return false;
 } // END - if
@@ -53,57 +54,54 @@ if (getConfig('autopurge_inactive') == 'Y') {
        initSqls();
 
        // Init exclusion list
+       // @TODO Rewrite these if() blocks to a filter
        $EXCLUDE_LIST = '';
-       if (getConfig('def_refid') > 0) {
-               $EXCLUDE_LIST = " AND d.userid != ".getConfig('def_refid');
-       } // END - if
-
+       if (isValidUserId(getConfig('def_refid'))) $EXCLUDE_LIST .= ' AND `userid` != {?def_refid?}';
        // Check for more extensions
-       if (isExtensionActive('beg'))     $EXCLUDE_LIST .= " AND d.userid != ".getConfig('beg_userid')."";
-       if (isExtensionActive('bonus'))   $EXCLUDE_LIST .= " AND d.userid != ".getConfig('bonus_userid')."";
-       if (isExtensionActive('doubler')) $EXCLUDE_LIST .= " AND d.userid != ".getConfig('doubler_userid')."";
+       if (isExtensionActive('beg'))     $EXCLUDE_LIST .= ' AND `userid` != {?beg_userid?}';
+       if (isExtensionActive('bonus'))   $EXCLUDE_LIST .= ' AND `userid` != {?bonus_userid?}';
+       if (isExtensionActive('doubler')) $EXCLUDE_LIST .= ' AND `userid` != {?doubler_userid?}';
 
        // Check for new holiday extension
-       if (getExtensionVersion('holiday') >= '0.1.3') {
+       if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
                // Include only users with no active holiday
-               $EXCLUDE_LIST .= " AND d.`holiday_active`='N'";
+               $EXCLUDE_LIST .= " AND `holiday_active`='N'";
        } // END - if
 
        // Check for all accounts
-       $result_inactive = SQL_QUERY_ESC("SELECT d.userid, d.email, d.last_online
+       $result_inactive = SQL_QUERY("SELECT
+       `userid`, `email`, `last_online`
 FROM
-       `{?_MYSQL_PREFIX?}_user_data` AS d
+       `{?_MYSQL_PREFIX?}_user_data`
 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."
+       `status`='CONFIRMED' AND
+       `joined` < (UNIX_TIMESTAMP() - {?ap_inactive_since?}) AND
+       `last_online` < (UNIX_TIMESTAMP() - {?ap_inactive_since?}) AND
+       `ap_notified` < (UNIX_TIMESTAMP() - {?ap_inactive_since?})
+       " . $EXCLUDE_LIST . "
 ORDER BY
-       d.userid ASC",
-               array(
-                       getConfig('ap_inactive_since'),
-                       getConfig('ap_inactive_since'),
-                       getConfig('ap_inactive_since')
-               ), __FILE__, __LINE__);
-
-       if (SQL_NUMROWS($result_inactive) > 0) {
+       `userid` ASC", __FILE__, __LINE__);
+
+       if (!SQL_HASZERONUMS($result_inactive)) {
                // Prepare variables and constants...
                $useridsContent = '';
-               $content['since'] = (getConfig('ap_inactive_since') / 60 / 60);
-               $content['time']  = (getConfig('ap_inactive_time')  / 60 / 60);
+               $content['since'] = (getApInactiveSince() / 60 / 60);
+               $content['time']  = (getApInactiveTime()  / 60 / 60);
 
                // Mark found accounts as inactive and send an email
-               while ($content = SQL_FETCHARRAY($result_inactive)) {
+               while ($row = SQL_FETCHARRAY($result_inactive)) {
+                       // Merge both arrays
+                       $content = merge_array($content, $row);
+
                        // Remember userids for the admin
-                       $useridsContent .= $content['userid'].", ";
+                       $useridsContent .= $content['userid'] . ', ';
 
                        // Get date/time from timestamp
                        $content['last_online'] = generateDateTime($content['last_online'], 0);
 
                        // Load mail template
                        $message = loadEmailTemplate('member_autopurge_inactive', $content, bigintval($content['userid']));
-                       sendEmail($content['email'], getMessage('AUTOPURGE_MEMBER_INACTIVE_SUBJECT'), $message);
+                       sendEmail($content['email'], '{--MEMBER_AUTOPURGE_INACTIVE_SUBJECT--}', $message);
 
                        // Update this account
                        addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `ap_notified`=UNIX_TIMESTAMP() WHERE `userid`=%s LIMIT 1",
@@ -114,7 +112,7 @@ ORDER BY
                $useridsContent = str_replace(', ', "\n", substr($useridsContent, 0, -2));
 
                // Send mail notification to admin
-               sendAdminNotification(getMessage('AUTOPURGE_ADMIN_INACTIVE_SUBJECT'), 'admin_autopurge_inactive', $useridsContent, '');
+               sendAdminNotification('{--ADMIN_AUTOPURGE_INACTIVE_SUBJECT--}', 'admin_autopurge_inactive', $useridsContent);
        } // END - if
 
        // Free memory
@@ -122,18 +120,20 @@ ORDER BY
 
        // 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
-       $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)
-".$EXCLUDE_LIST."
-ORDER BY `userid` ASC",
-               array(
-                       getConfig('ap_inactive_since'),
-                       getConfig('ap_inactive_since'),
-                       getConfig('ap_inactive_time')
-               ), __FILE__, __LINE__);
-
-       if (SQL_NUMROWS($result_inactive) > 0) {
+       $result_inactive = SQL_QUERY("SELECT
+       `userid`, `email`, `last_online`
+FROM
+       `{?_MYSQL_PREFIX?}_user_data`
+WHERE
+       `status`='CONFIRMED' AND
+       `joined` < (UNIX_TIMESTAMP() - {?ap_inactive_since?}) AND
+       `last_online` < (UNIX_TIMESTAMP() - {?ap_inactive_since?}) AND
+       `ap_notified` < (UNIX_TIMESTAMP() - {?ap_inactive_time?})
+" . $EXCLUDE_LIST . "
+ORDER BY
+       `userid` ASC", __FILE__, __LINE__);
+
+       if (!SQL_HASZERONUMS($result_inactive)) {
                // Prepare variable...
                $useridsContent = '';
 
@@ -154,7 +154,7 @@ ORDER BY `userid` ASC",
 
                // Send mail notification to admin
                if (getConfig('ap_in_notify') == 'Y') {
-                       sendAdminNotification(getMessage('AUTOPURGE_ADMIN_DELETE_SUBJECT'), 'admin_autopurge_delete', $useridsContent, '');
+                       sendAdminNotification('{--ADMIN_AUTOPURGE_DELETE_SUBJECT--}', 'admin_autopurge_delete', $useridsContent);
                } // END - if
        } // END - if