X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-list_autopurge.php;h=ebd36f00879237ccb3e3f0c358f49852753fb02a;hb=61621983cc6d7195fcc7eab29b5f6080ff283b34;hp=d35b1b4d9fc1bab289c67e62a83b60a0990d6756;hpb=e5dffd4249c97200cbad02f3f4eaf5c373fdb89a;p=mailer.git

diff --git a/inc/modules/admin/what-list_autopurge.php b/inc/modules/admin/what-list_autopurge.php
index d35b1b4d9f..ebd36f0087 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 - 2013 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2016 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -44,18 +44,13 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // Exclude default referral id if set
-$userExclusionSql = ' ';
+$userExcludeSql = ' ';
 $excludedUserids = runFilterChain('config_userid_exclusion_sql', array());
 if (isFilledArray($excludedUserids)) {
 	// 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 = sqlQuery("SELECT
 	`d`.`userid`,
@@ -73,11 +68,11 @@ 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?}
-	" . runFilterChain('user_exclusion_sql', $userExcludeSql) . "
+	" . runFilterChain('user_exclusion_sql', ' ' . $userExcludeSql) . "
 ORDER BY
 	`d`.`userid` ASC", __FILE__, __LINE__);
 
-if (!ifSqlHasZeroNums($result)) {
+if (!ifSqlHasZeroNumRows($result)) {
 	// Ok, we have found some inactive accounts
 	$OUT = '';
 	while ($content = sqlFetchArray($result)) {