More misc fixes and rewrites (sorry, lame description)

[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 58698e656643edd127a3f23d6514a007b7627213..57b6a3f8bc81d8169c5e1d1c74ef76c9771ac8d2 100644 (file)
--- a/inc/modules/admin/what-list_autopurge.php
+++ b/inc/modules/admin/what-list_autopurge.php
@@ -38,7 +38,7 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
 
@@ -59,11 +59,18 @@ if (EXT_IS_ACTIVE('doubler'))              $EXCLUDE_LIST .= " AND d.userid != ".
 if (GET_EXT_VERSION('holiday') >= '0.1.3') $EXCLUDE_LIST .= " AND d.holiday_active='N'";
 
 // Check for all accounts
-$result = SQL_QUERY_ESC("SELECT DISTINCT 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)
-".$EXCLUDE_LIST."
-ORDER BY d.userid",
+$result = SQL_QUERY_ESC("SELECT DISTINCT
+       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)
+       ".$EXCLUDE_LIST."
+ORDER BY
+       d.userid ASC",
        array(
                getConfig('ap_inactive_since'),
                getConfig('ap_inactive_since'),
@@ -78,18 +85,18 @@ if (SQL_NUMROWS($result) > 0) {
                // @TODO Rewritings: sname->surname,fname->family in templates
                $content = array(
                        'sw'       => $SW,
-                       'uid'      => ADMIN_USER_PROFILE_LINK($content['userid']),
-                       'gender'   => TRANSLATE_GENDER($content['gender']),
+                       'uid'      => generateUserProfileLink($content['userid']),
+                       'gender'   => translateGender($content['gender']),
                        'sname'    => $content['surname'],
                        'fname'    => $content['family'],
-                       'email'    => "<a href=\"".CREATE_EMAIL_LINK($content['email'], "user_data")."\">".$content['email']."</a>",
-                       'joined'   => MAKE_DATETIME($content['joined'], "2"),
-                       'last'     => MAKE_DATETIME($content['last_online'], "2"),
-                       'notified' => MAKE_DATETIME($content['ap_notified'], "2"),
+                       'email'    => "<a href=\"".generateEmailLink($content['email'], 'user_data')."\">".$content['email']."</a>",
+                       'joined'   => generateDateTime($content['joined'], '2'),
+                       'last'     => generateDateTime($content['last_online'], '2'),
+                       'notified' => generateDateTime($content['ap_notified'], '2'),
                );
 
                // Load row template
-               $OUT .= LOAD_TEMPLATE("admin_list_autopurge_row", true, $content);
+               $OUT .= LOAD_TEMPLATE('admin_list_autopurge_row', true, $content);
                $SW = 3 - $SW;
        }
 
@@ -99,7 +106,7 @@ if (SQL_NUMROWS($result) > 0) {
        define('__AUTOPURGE_ROWS', $OUT);
 
        // Load main template
-       LOAD_TEMPLATE("admin_list_autopurge");
+       LOAD_TEMPLATE('admin_list_autopurge');
 } else {
        // All members are active or you don't have any registered
        LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_AUTOPURGE_ALL_ACTIVE'));