X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Ftask_functions.php;h=95be2052d6e96477d6cfb35ead42d3f9eb2aea1f;hb=61621983cc6d7195fcc7eab29b5f6080ff283b34;hp=dbe4b77ffd6be072934a1146ffa1886c03ed3f94;hpb=1a27ebf17236325ab0de95a61701ac8e4f8e0616;p=mailer.git
diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index dbe4b77ffd..95be2052d6 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 - 2012 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 *
@@ -88,25 +88,28 @@ function outputAdvancedOverview (&$result_main) {
$content['update_tasks'] = '' . $value . '';
} // END - if
- //
- // First check for all account status seperately
- //
- // Confirmed accounts
- $value = getTotalConfirmedUser();
- if ($value > 0) {
- $content['confirmed_members'] = '' . $value . '';
- } // END - if
+ // Do this only if ext-user is installed
+ if (isExtensionInstalled('user')) {
+ //
+ // First check for all account status seperately
+ //
+ // Confirmed accounts
+ $value = getTotalConfirmedUser();
+ if ($value > 0) {
+ $content['confirmed_members'] = '' . $value . '';
+ } // END - if
- // Unconfirmed accounts
- $value = getTotalUnconfirmedUser();
- if ($value > 0) {
- $content['unconfirmed_members'] = '' . $value . '';
- } // END - if
+ // Unconfirmed accounts
+ $value = getTotalUnconfirmedUser();
+ if ($value > 0) {
+ $content['unconfirmed_members'] = '' . $value . '';
+ } // END - if
- // Locked accounts
- $value = getTotalLockedUser();
- if ($value > 0) {
- $content['locked_members'] = '' . $value . '';
+ // Locked accounts
+ $value = getTotalLockedUser();
+ if ($value > 0) {
+ $content['locked_members'] = '' . $value . '';
+ } // END - if
} // END - if
if (isExtensionInstalledAndNewer('user', '0.3.4')) {
@@ -254,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`,
@@ -273,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';
@@ -328,7 +324,7 @@ ORDER BY
// Both extensions must be there
if ((isExtensionInstalledAndNewer('bonus', '0.2.3')) && (isExtensionActive('user'))) {
// Get more columns
- $add = runFilterChain('add_bonus_points_user_columns', '');
+ $add = trim(runFilterChain('add_bonus_points_user_columns', ''));
// Active rallye, so add more point columns, if not empty
$pointsColumns = '';
@@ -345,7 +341,10 @@ ORDER BY
$lastOnline = ' AND (UNIX_TIMESTAMP() - `last_online`) < {?ap_inactive_since?}';
} // END - if
- addSql("SELECT
+ // Is it empty?
+ if (!empty($ointsColumns)) {
+ // No, then add it
+ addSql("SELECT
" . $pointsColumns . " AS `points`
FROM
`{?_MYSQL_PREFIX?}_user_data`
@@ -356,10 +355,11 @@ WHERE
ORDER BY
`points` DESC,
`userid` ASC");
- $WHATs[] = 'list_bonus';
- $DESCRs[] = '{--ADMIN_TASK_LIST_BONUS--}';
- $TITLEs[] = '{--ADMIN_TASK_LIST_BONUS_TITLE--}';
- }
+ $WHATs[] = 'list_bonus';
+ $DESCRs[] = '{--ADMIN_TASK_LIST_BONUS--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_BONUS_TITLE--}';
+ } // END - if
+ } // END - if
// Again both extensions must be there
if ((isExtensionInstalledAndNewer('beg', '0.1.2')) && (isExtensionActive('user'))) {
@@ -530,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
@@ -557,7 +563,7 @@ function createExtraTaskRows ($WHATs, $DESCRs, $TITLEs) {
// New format...
foreach ($sqls as $key => $sql) {
// Run SQL command, get line numbers and free memory
- $result = SQL_QUERY($sql, __FUNCTION__, __LINE__);
+ $result = sqlQuery($sql, __FUNCTION__, __LINE__);
// Prepare array for output
$content = array(
@@ -570,17 +576,17 @@ function createExtraTaskRows ($WHATs, $DESCRs, $TITLEs) {
$content['bottom'] = 'bottom';
} // END - if
- if ((!SQL_HASZERONUMS($result)) && (!empty($WHATs[$key]))) {
+ if ((!ifSqlHasZeroNumRows($result)) && (!empty($WHATs[$key]))) {
if (empty($TITLEs[$key])) {
$TITLEs[$key] = '{--ADMIN_TASK_UNKNOWN_LIST_TITLE--}';
} // END - if
- $content['row_link'] = '' . SQL_NUMROWS($result) . '';
+ $content['row_link'] = '' . sqlNumRows($result) . '';
} else {
$content['row_link'] = '0';
}
// Free result
- SQL_FREERESULT($result);
+ sqlFreeResult($result);
// And insert the final string into extras template
$OUT .= loadTemplate('admin_overview_task_rows', TRUE, $content);