New function isValidUserid() introduced, more rewrites to EL:

[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 5cbd50969325dab6d9203d9c5439ed339e2d989e..50b09a99bebd1d902f1f7f5d54b01cf48f6fd27e 100644 (file)
--- a/inc/modules/admin/what-list_autopurge.php
+++ b/inc/modules/admin/what-list_autopurge.php
@@ -59,34 +59,28 @@ if (isExtensionActive('doubler'))              $EXCLUDE_LIST .= ' AND d.userid !
 if (isExtensionInstalledAndNewer('holiday', '0.1.3')) $EXCLUDE_LIST .= " AND d.holiday_active='N'";
 
 // Check for all accounts
-$result = SQL_QUERY_ESC("SELECT
+$result = SQL_QUERY("SELECT
        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() - %s) AND
-       d.last_online < (UNIX_TIMESTAMP() - %s) AND
-       d.ap_notified < (UNIX_TIMESTAMP() - %s)
+       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",
-       array(
-               getConfig('ap_inactive_since'),
-               getConfig('ap_inactive_since'),
-               getConfig('ap_inactive_since')
-       ), __FILE__, __LINE__);
+       d.userid ASC", __FILE__, __LINE__);
 
 if (SQL_NUMROWS($result) > 0) {
        // Ok, we have found some inactive accounts
        $OUT = ''; $SW = 2;
        while ($content = SQL_FETCHARRAY($result)) {
                // Prepare data for the row template
-               // @TODO Rewritings: surname->surname,family->family in templates
                $content = array(
                        'sw'          => $SW,
-                       'userid'      => generateUserProfileLink($content['userid']),
-                       'gender'      => translateGender($content['gender']),
+                       'userid'      => $content['userid'],
+                       'gender'      => $content['gender'],
                        'surname'     => $content['surname'],
                        'family'      => $content['family'],
                        'email'       => '<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['email'] . '</a>',