Wrapper function introduced, description for random refid rewritten:

[mailer.git] / inc / modules / admin / what-list_autopurge.php

diff --git a/inc/modules/admin/what-list_autopurge.php b/inc/modules/admin/what-list_autopurge.php
index 69404cd4371d373a366448276859d2ae3a537110..2835465e1bca631c2b3dad303171f4c75feb0ec5 100644 (file)
--- a/inc/modules/admin/what-list_autopurge.php
+++ b/inc/modules/admin/what-list_autopurge.php
@@ -46,25 +46,25 @@ addMenuDescription('admin', __FILE__);
 // Exclude default referal id if set
 // @TODO Rewrite those lines to filter
 $EXCLUDE_LIST = '';
-if (getConfig('def_refid') > 0)                $EXCLUDE_LIST .= ' AND d.userid != {?def_refid?}';
+if (isValidUserId(getDefRefid()))              $EXCLUDE_LIST .= ' AND d.userid != {?def_refid?}';
 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 (isExtensionInstalledAndNewer('holiday', '0.1.3')) $EXCLUDE_LIST .= " AND d.holiday_active='N'";
+if (isExtensionInstalledAndNewer('holiday', '0.1.3')) $EXCLUDE_LIST .= " AND d.`holiday_active`='N'";
 
 // Check for all accounts
 $result = SQL_QUERY("SELECT
-       d.userid, d.gender, d.surname, d.family, d.email, d.joined, d.last_online, d.ap_notified
+       d.`userid`, d.`gender`, d.`surname`, d.`family`, d.`email`, d.`joined`, d.`last_online`, d.`ap_notified`
 FROM
        `{?_MYSQL_PREFIX?}_user_data` AS d
 WHERE
        d.`status`='CONFIRMED' AND
-       d.joined < (UNIX_TIMESTAMP() - {?ap_inactive_since?}) AND
-       d.last_online < (UNIX_TIMESTAMP() - {?ap_inactive_since?}) AND
-       d.ap_notified < (UNIX_TIMESTAMP() - {?ap_inactive_since?})
+       d.`joined` < (UNIX_TIMESTAMP() - {?ap_inactive_since?}) AND
+       d.`last_online` < (UNIX_TIMESTAMP() - {?ap_inactive_since?}) AND
+       d.`ap_notified` < (UNIX_TIMESTAMP() - {?ap_inactive_since?})
        ".$EXCLUDE_LIST."
 ORDER BY
-       d.userid ASC", __FILE__, __LINE__);
+       d.`userid` ASC", __FILE__, __LINE__);
 
 if (!SQL_HASZERONUMS($result)) {
        // Ok, we have found some inactive accounts
@@ -79,7 +79,7 @@ if (!SQL_HASZERONUMS($result)) {
                        'email'       => '<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['email'] . '</a>',
                        'joined'      => generateDateTime($content['joined'], 2),
                        'last_online' => generateDateTime($content['last_online'], 2),
-                       'notified'    => generateDateTime($content['ap_notified'], 2),
+                       'ap_notified' => generateDateTime($content['ap_notified'], 2),
                );
 
                // Load row template