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

diff --git a/inc/modules/admin/what-list_autopurge.php b/inc/modules/admin/what-list_autopurge.php
index eb76f798e2..861acbd497 100644
--- a/inc/modules/admin/what-list_autopurge.php
+++ b/inc/modules/admin/what-list_autopurge.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * 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 *
@@ -44,16 +44,15 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // Exclude default referral id if set
-// @TODO Rewrite those lines to filter
-$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'";
+$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
+$result = sqlQuery("SELECT
 	`d`.`userid`,
 	`d`.`gender`,
 	`d`.`surname`,
@@ -69,14 +68,14 @@ WHERE
 	(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 . "
+	" . runFilterChain('user_exclusion_sql', ' ' . $userExcludeSql) . "
 ORDER BY
 	`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'],
@@ -94,7 +93,7 @@ if (!SQL_HASZERONUMS($result)) {
 	} // END - while
 
 	// Free memory
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 	$content['rows'] = $OUT;
 
 	// Load main template