X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_autopurge.php;h=861acbd4972126d8d95e81acc1da48be4f71847b;hp=b10ac0abe459dd88c933a9e6bae1f5e5410acaa9;hb=d44a7739c860ef0f30e29167b0fea0d2141ebce6;hpb=2e394cb5b8a6225a39a6942b1fcc17c37a17a175

diff --git a/inc/modules/admin/what-list_autopurge.php b/inc/modules/admin/what-list_autopurge.php
index b10ac0abe4..861acbd497 100644
--- a/inc/modules/admin/what-list_autopurge.php
+++ b/inc/modules/admin/what-list_autopurge.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -43,33 +43,39 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addYouAreHereLink('admin', __FILE__);
 
-// Exclude default referal id if set
-// @TODO Rewrite those lines to filter
-$EXCLUDE_LIST = '';
-if (isValidUserId(getDefRefid()))              $EXCLUDE_LIST .= ' AND d.userid != {?def_refid?}';
-if (isExtensionActive('beg'))                  $EXCLUDE_LIST .= ' AND d.userid != {?beg_userid?}';
-if (isExtensionActive('bonus'))                $EXCLUDE_LIST .= ' AND d.userid != {?bonus_userid?}';
-if (isExtensionActive('doubler'))              $EXCLUDE_LIST .= ' AND d.userid != {?doubler_userid?}';
-if (isExtensionInstalledAndNewer('holiday', '0.1.3')) $EXCLUDE_LIST .= " AND d.`holiday_active`='N'";
+// Exclude default referral id if set
+$userExcludeSql = ' ';
+$excludedUserids = runFilterChain('config_userid_exclusion_sql', array());
+if (isFilledArray($excludedUserids)) {
+	// Exclude all
+	$userExcludeSql = ' AND `d`.`userid` NOT IN (' . implode(', ', $excludedUserids) . ')';
+} // END - if
 
 // Check for all accounts
-$result = SQL_QUERY("SELECT
-	d.`userid`, d.`gender`, d.`surname`, d.`family`, d.`email`, d.`joined`, d.`last_online`, d.`ap_notified`
+$result = sqlQuery("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
+	`{?_MYSQL_PREFIX?}_user_data` AS `d`
 WHERE
-	d.`status`='CONFIRMED' AND
-	(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?}
-	".$EXCLUDE_LIST."
+	`d`.`status`='CONFIRMED' AND
+	(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?}
+	" . runFilterChain('user_exclusion_sql', ' ' . $userExcludeSql) . "
 ORDER BY
-	d.`userid` ASC", __FILE__, __LINE__);
+	`d`.`userid` ASC", __FILE__, __LINE__);
 
-if (!SQL_HASZERONUMS($result)) {
+if (!ifSqlHasZeroNums($result)) {
 	// Ok, we have found some inactive accounts
 	$OUT = '';
-	while ($content = SQL_FETCHARRAY($result)) {
+	while ($content = sqlFetchArray($result)) {
 		// Prepare data for the row template
 		$content = array(
 			'userid'      => $content['userid'],
@@ -83,15 +89,15 @@ if (!SQL_HASZERONUMS($result)) {
 		);
 
 		// Load row template
-		$OUT .= loadTemplate('admin_list_autopurge_row', true, $content);
+		$OUT .= loadTemplate('admin_list_autopurge_row', TRUE, $content);
 	} // END - while
 
 	// Free memory
-	SQL_FREERESULT($result);
+	sqlFreeResult($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
 	displayMessage('{--ADMIN_AUTOPURGE_ALL_ACTIVE--}');