New method generateExtensionInactiveMessage() introduced

[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 dade5fa98ffd75e1402330891b76bc3addf12a99..9dbd590edf9fe5a04fd75f76f7b654fc16d43a52 100644 (file)
--- a/inc/modules/admin/what-list_autopurge.php
+++ b/inc/modules/admin/what-list_autopurge.php
@@ -56,7 +56,7 @@ if (getConfig('def_refid') > 0) {
 if (EXT_IS_ACTIVE('beg'))                  $EXCLUDE_LIST .= " AND d.userid != ".getConfig('beg_uid')."";
 if (EXT_IS_ACTIVE('bonus'))                $EXCLUDE_LIST .= " AND d.userid != ".getConfig('bonus_uid')."";
 if (EXT_IS_ACTIVE('doubler'))              $EXCLUDE_LIST .= " AND d.userid != ".getConfig('doubler_uid')."";
-if (GET_EXT_VERSION('holiday') >= '0.1.3') $EXCLUDE_LIST .= " AND d.holiday_active='N'";
+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
@@ -64,11 +64,11 @@ 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",
-       array(
-               getConfig('ap_inactive_since'),
-               getConfig('ap_inactive_since'),
-               getConfig('ap_inactive_since')
-       ), __FILE__, __LINE__);
+array(
+getConfig('ap_inactive_since'),
+getConfig('ap_inactive_since'),
+getConfig('ap_inactive_since')
+), __FILE__, __LINE__);
 
 if (SQL_NUMROWS($result) > 0) {
        // Ok, we have found some inactive accounts
@@ -78,14 +78,14 @@ 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=\"".generateMemberEmailLink($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