X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-list_autopurge.php;h=3213480bbf2cdb004c444d7f2e47a71dcb80f1e3;hb=94eb7e461c29c7050a41aa6d5edcd3a1707bf904;hp=1ec7c1b2d273e0a28d3cfdd597e574d43694cbad;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60;p=mailer.git
diff --git a/inc/modules/admin/what-list_autopurge.php b/inc/modules/admin/what-list_autopurge.php
index 1ec7c1b2d2..3213480bbf 100644
--- a/inc/modules/admin/what-list_autopurge.php
+++ b/inc/modules/admin/what-list_autopurge.php
@@ -1,7 +1,7 @@
0) {
- $EXCLUDE_LIST = " AND d.userid != ".getConfig('def_refid')."";
-} // END - if
-
-// Check for more extensions
+// Exclude default referral id if set
// @TODO Rewrite those lines to filter
-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'";
+$userExclusionSql = runFilterChain('user_exclusion_sql', ' ');
+if (isValidId(getDefRefid())) $userExclusionSql .= ' AND d.userid != {?def_refid?}';
+if (isExtensionActive('beg')) $userExclusionSql .= ' AND d.userid != {?beg_userid?}';
+if (isExtensionActive('bonus')) $userExclusionSql .= ' AND d.userid != {?bonus_userid?}';
+if (isExtensionActive('doubler')) $userExclusionSql .= ' AND d.userid != {?doubler_userid?}';
+if (isExtensionInstalledAndNewer('holiday', '0.1.3')) $userExclusionSql .= " AND d.`holiday_active`='N'";
// Check for all accounts
-$result = SQL_QUERY_ESC("SELECT
- d.userid, d.gender, d.surname, d.family, d.email, d.joined, d.last_online, d.ap_notified
+$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)
- ".$EXCLUDE_LIST."
+ (UNIX_TIMESTAMP() - d.`joined`) >= {?ap_inactive_since?} AND
+ (UNIX_TIMESTAMP() - d.`last_online`) >= {?ap_inactive_since?} AND
+ (UNIX_TIMESTAMP() - d.`ap_notified`) >= {?ap_inactive_since?}
+ " . $userExclusionSql . "
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) {
+if (!SQL_HASZERONUMS($result)) {
// Ok, we have found some inactive accounts
- $OUT = ''; $SW = 2;
+ $OUT = '';
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' => "".$content['email']."",
+ 'email' => '' . $content['email'] . '',
'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
- $OUT .= loadTemplate('admin_list_autopurge_row', true, $content);
- $SW = 3 - $SW;
- }
+ $OUT .= loadTemplate('admin_list_autopurge_row', TRUE, $content);
+ } // END - while
// Free memory
SQL_FREERESULT($result);
$content['rows'] = $OUT;
// Load main template
- loadTemplate('admin_list_autopurge', false, $content);
+ loadTemplate('admin_list_autopurge', FALSE, $content);
} else {
// All members are active or you don't have any registered
- loadTemplate('admin_settings_saved', false, getMessage('ADMIN_AUTOPURGE_ALL_ACTIVE'));
+ displayMessage('{--ADMIN_AUTOPURGE_ALL_ACTIVE--}');
}
// [EOF]