X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Ftask_functions.php;h=9142672cabd8a285e2d8d65ea5387d8c8f73dc2a;hb=f40ee6b3fe47308625f3490dedb1c52174ddf9f1;hp=d7eda6440235981fb367b95428ecb5015445b814;hpb=8cab12aa2bd0bd1de03a377b37cd42faae64b0e1;p=mailer.git

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index d7eda64402..9142672cab 100644
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.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 *
@@ -257,13 +257,6 @@ function outputAdvancedOverview (&$result_main) {
 			$userExclusionSql .= ' AND `d`.`userid` NOT IN (' . implode(', ', $excludedUserids) . ')';
 		} // END - if
 
-		// Check for more extensions
-		// @TODO This can be rewritten to filter
-		if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
-			// Recent ext-holiday found
-			$userExclusionSql .= " AND `d`.`holiday_active`='N'";
-		} // END - if
-
 		// Check for all accounts
 		addSql("SELECT
 	`d`.`userid`,
@@ -276,7 +269,7 @@ 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', $userExclusionSql) . "
+	" . runFilterChain('user_exclusion_sql', ' ' . $userExclusionSql) . "
 ORDER BY
 	`d`.`userid` ASC");
 		$WHATs[]  = 'list_autopurge';
@@ -523,7 +516,7 @@ ORDER BY
 		$TITLEs[] = '{--ADMIN_TASK_LIST_SURFBAR_URLS_PENDING_TITLE--}';
 	} // END - if
 
-	if (isExtensionInstalledAndNewer('sql_patches', '0.9.2')) {
+	if (isExtensionInstalled('server_name')) {
 		// Check for wrong "SERVER_NAME" entries
 		addSql('SELECT `server_name_id` FROM `{?_MYSQL_PREFIX?}_server_name_log`');
 		$DESCRs[] = '{--ADMIN_TASK_LIST_SERVER_NAME_LOG--}';
@@ -537,6 +530,12 @@ ORDER BY
 		$DESCRs[] = '{--ADMIN_TASK_LIST_NETWORK_HEADER_LOG--}';
 		$TITLEs[] = '{--ADMIN_TASK_LIST_NETWORK_HEADER_LOG_TITLE--}';
 		$WHATs[]  = 'list_network_http_header';
+
+		// Check for API cache entries
+		addSql('SELECT `network_cache_id` FROM `{?_MYSQL_PREFIX?}_network_cache`');
+		$DESCRs[] = '{--ADMIN_TASK_LIST_NETWORK_API_CACHE--}';
+		$TITLEs[] = '{--ADMIN_TASK_LIST_NETWORK_API_CACHE_TITLE--}';
+		$WHATs[]  = 'list_network_api';
 	} // END - if
 
 	// Generate extra overview rows
@@ -577,7 +576,7 @@ function createExtraTaskRows ($WHATs, $DESCRs, $TITLEs) {
 				$content['bottom'] = 'bottom';
 			} // END - if
 
-			if ((!ifSqlHasZeroNums($result)) && (!empty($WHATs[$key]))) {
+			if ((!ifSqlHasZeroNumRows($result)) && (!empty($WHATs[$key]))) {
 				if (empty($TITLEs[$key])) {
 					$TITLEs[$key] = '{--ADMIN_TASK_UNKNOWN_LIST_TITLE--}';
 				} // END - if