X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_autopurge.php;h=4291eb17dd312d2314506fe58a94c4249c492469;hb=cd7d344ea7007cfa20413acd3e03e50f0ab86d86;hp=2835465e1bca631c2b3dad303171f4c75feb0ec5;hpb=f0c86248d1ca0d6d0859d98796cb1da28884201e;p=mailer.git

diff --git a/inc/modules/admin/what-list_autopurge.php b/inc/modules/admin/what-list_autopurge.php
index 2835465e1b..4291eb17dd 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, 2010 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 *
@@ -41,30 +41,41 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+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
+$userExclusionSql = ' ';
+$excludedUserids = runFilterChain('config_userid_exclusion_sql', array());
+if (count($excludedUserids) > 0) {
+	// Exclude all
+	$userExcludeSql = ' AND `d`.`userid` NOT IN (' . implode(', ', $excludedUserids) . ')';
+} // END - if
+
+// @TODO Rewrite this as a filter
+if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
+	$userExclusionSql .= " AND `d`.`holiday_active`='N'";
+} // 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`
+	`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
-	d.`joined` < (UNIX_TIMESTAMP() - {?ap_inactive_since?}) AND
-	d.`last_online` < (UNIX_TIMESTAMP() - {?ap_inactive_since?}) AND
-	d.`ap_notified` < (UNIX_TIMESTAMP() - {?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)) {
 	// Ok, we have found some inactive accounts
@@ -83,7 +94,7 @@ 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
@@ -91,10 +102,10 @@ if (!SQL_HASZERONUMS($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, '{--ADMIN_AUTOPURGE_ALL_ACTIVE--}');
+	displayMessage('{--ADMIN_AUTOPURGE_ALL_ACTIVE--}');
 }
 
 // [EOF]