Wrapper function introduced, description for random refid rewritten:

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

diff --git a/inc/autopurge/purge-inact.php b/inc/autopurge/purge-inact.php
index d3c9b49150e6029b551c22b2e6a877e23358b1f2..3301af8d1916532adfb87062fd76aaa14218b7ad 100644 (file)
--- a/inc/autopurge/purge-inact.php
+++ b/inc/autopurge/purge-inact.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -56,35 +54,31 @@ if (getConfig('autopurge_inactive') == 'Y') {
        // Init exclusion list
        // @TODO Rewrite these if() blocks to a filter
        $EXCLUDE_LIST = '';
-       if (isValidUserId(getConfig('def_refid'))) $EXCLUDE_LIST .= ' AND d.`userid` != {?def_refid?}';
+       if (isValidUserId(getDefRefid())) $EXCLUDE_LIST .= ' AND `userid` != {?def_refid?}';
        // Check for more extensions
-       if (isExtensionActive('beg'))     $EXCLUDE_LIST .= ' AND d.`userid` != {?beg_userid?}';
-       if (isExtensionActive('bonus'))   $EXCLUDE_LIST .= ' AND d.`userid` != {?bonus_userid?}';
-       if (isExtensionActive('doubler')) $EXCLUDE_LIST .= ' AND d.`userid` != {?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 (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(
-                       getApInactiveSince(),
-                       getApInactiveSince(),
-                       getApInactiveSince()
-               ), __FILE__, __LINE__);
+       `userid` ASC", __FILE__, __LINE__);
 
        if (!SQL_HASZERONUMS($result_inactive)) {
                // Prepare variables and constants...
@@ -105,7 +99,7 @@ ORDER BY
 
                        // Load mail template
                        $message = loadEmailTemplate('member_autopurge_inactive', $content, bigintval($content['userid']));
-                       sendEmail($content['email'], '{--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",
@@ -125,15 +119,15 @@ 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("SELECT
-       d.userid, d.email, d.last_online
+       `userid`, `email`, `last_online`
 FROM
-       `{?_MYSQL_PREFIX?}_user_data` AS d
+       `{?_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."
+" . $EXCLUDE_LIST . "
 ORDER BY
        `userid` ASC", __FILE__, __LINE__);