X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_autopurge.php;h=14e42f36cc13ce6d4acf4dce31b80a2df30b37a8;hb=de3147a2ad17532517bb3e67d8dee67d68cdcec6;hp=58698e656643edd127a3f23d6514a007b7627213;hpb=a090e351c49fe021fb3064325694da03402332e0;p=mailer.git
diff --git a/inc/modules/admin/what-list_autopurge.php b/inc/modules/admin/what-list_autopurge.php
index 58698e6566..14e42f36cc 100644
--- a/inc/modules/admin/what-list_autopurge.php
+++ b/inc/modules/admin/what-list_autopurge.php
@@ -1,7 +1,7 @@
0) {
// Check for more extensions
// @TODO Rewrite those lines to filter
-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 (isExtensionActive('beg')) $EXCLUDE_LIST .= " AND d.userid != ".getConfig('beg_userid')."";
+if (isExtensionActive('bonus')) $EXCLUDE_LIST .= " AND d.userid != ".getConfig('bonus_userid')."";
+if (isExtensionActive('doubler')) $EXCLUDE_LIST .= " AND d.userid != ".getConfig('doubler_userid')."";
+if (isExtensionInstalledAndNewer('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
+ 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'),
@@ -75,35 +81,34 @@ if (SQL_NUMROWS($result) > 0) {
$OUT = ''; $SW = 2;
while ($content = SQL_FETCHARRAY($result)) {
// Prepare data for the row template
- // @TODO Rewritings: sname->surname,fname->family in templates
+ // @TODO Rewritings: surname->surname,family->family in templates
$content = array(
- 'sw' => $SW,
- 'uid' => ADMIN_USER_PROFILE_LINK($content['userid']),
- 'gender' => TRANSLATE_GENDER($content['gender']),
- 'sname' => $content['surname'],
- 'fname' => $content['family'],
- 'email' => "".$content['email']."",
- 'joined' => MAKE_DATETIME($content['joined'], "2"),
- 'last' => MAKE_DATETIME($content['last_online'], "2"),
- 'notified' => MAKE_DATETIME($content['ap_notified'], "2"),
+ 'sw' => $SW,
+ 'userid' => generateUserProfileLink($content['userid']),
+ 'gender' => translateGender($content['gender']),
+ 'surname' => $content['surname'],
+ 'family' => $content['family'],
+ 'email' => '' . $content['email'] . '',
+ 'joined' => generateDateTime($content['joined'], 2),
+ 'last_online' => generateDateTime($content['last_online'], 2),
+ 'notified' => generateDateTime($content['ap_notified'], 2),
);
// Load row template
- $OUT .= LOAD_TEMPLATE("admin_list_autopurge_row", true, $content);
+ $OUT .= loadTemplate('admin_list_autopurge_row', true, $content);
$SW = 3 - $SW;
}
// Free memory
SQL_FREERESULT($result);
- // @TODO Rewrite this constant
- define('__AUTOPURGE_ROWS', $OUT);
+ $content['rows'] = $OUT;
// Load main template
- LOAD_TEMPLATE("admin_list_autopurge");
+ loadTemplate('admin_list_autopurge', false, $content);
} else {
// All members are active or you don't have any registered
- LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_AUTOPURGE_ALL_ACTIVE'));
+ loadTemplate('admin_settings_saved', false, getMessage('ADMIN_AUTOPURGE_ALL_ACTIVE'));
}
-//
+// [EOF]
?>