X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Ftask_functions.php;h=9142672cabd8a285e2d8d65ea5387d8c8f73dc2a;hp=f067f2e4ebcaca546ed04590ede935f82e60080d;hb=f40ee6b3fe47308625f3490dedb1c52174ddf9f1;hpb=f0c86248d1ca0d6d0859d98796cb1da28884201e
diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index f067f2e4eb..9142672cab 100644
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.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 - 2016 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 *
@@ -67,7 +67,7 @@ function outputAdvancedOverview (&$result_main) {
foreach (
array(
// Member accounts
- 'confirmed_members','unconfirmed_members','locked_members',
+ 'confirmed_members','unconfirmed_members','locked_members','random_refid','testers',
// Tasks
'update_tasks','new_tasks','closed_tasks','your_tasks','deleted_tasks','solved_tasks',
// Mail orders
@@ -82,40 +82,56 @@ function outputAdvancedOverview (&$result_main) {
} // END - foreach
// Extension updates found
- $value = countSumTotalData(getCurrentAdminId(), 'task_system', 'id', 'assigned_admin', true, " AND `status`='NEW' AND `task_type`='EXTENSION_UPDATE'");
+ $value = countSumTotalData(getCurrentAdminId(), 'task_system', 'id', 'assigned_admin', TRUE, " AND `status`='NEW' AND `task_type`='EXTENSION_UPDATE'");
if ($value > 0) {
$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();
+ // Unconfirmed accounts
+ $value = getTotalUnconfirmedUser();
+ if ($value > 0) {
+ $content['unconfirmed_members'] = '' . $value . '';
+ } // END - if
- if ($value > 0) {
- $content['unconfirmed_members'] = '' . $value . '';
+ // Locked accounts
+ $value = getTotalLockedUser();
+ if ($value > 0) {
+ $content['locked_members'] = '' . $value . '';
+ } // END - if
} // END - if
+ if (isExtensionInstalledAndNewer('user', '0.3.4')) {
+ // And random refid
+ $value = getTotalRandomRefidUser();
+ if ($value > 0) {
+ $content['random_refid'] = '' . $value . '';
+ } // END - if
- // And locked accounts
- $value = getTotalLockedUser();
- if ($value > 0) {
- $content['locked_members'] = '' . $value . '';
+ if (isExtensionInstalledAndNewer('user', '0.5.0')) {
+ // And tester accounts
+ $value = getTotalTesterUsers();
+ if ($value > 0) {
+ $content['testers'] = '' . $value . '';
+ } // END - if
+ } // END - if
} // END - if
//
// Unassigned tasks
//
- $value = countSumTotalData(0, 'task_system', 'id', 'assigned_admin', true, " AND `status` != 'DELETED'");
+ $value = countSumTotalData(NULL, 'task_system', 'id', 'assigned_admin', TRUE, " AND `status` != 'DELETED'");
if ($value > 0) {
$content['new_tasks'] = '' . $value . '';
@@ -124,7 +140,7 @@ function outputAdvancedOverview (&$result_main) {
//
// Closed tasks
//
- $value = countSumTotalData('CLOSED', 'task_system', 'id', 'status', true);
+ $value = countSumTotalData('CLOSED', 'task_system', 'id', 'status', TRUE);
if ($value > 0) {
$content['closed_tasks'] = '' . $value . '';
@@ -133,7 +149,7 @@ function outputAdvancedOverview (&$result_main) {
//
// Deleted tasks
//
- $value = countSumTotalData('DELETED', 'task_system', 'id', 'status', true);
+ $value = countSumTotalData('DELETED', 'task_system', 'id', 'status', TRUE);
if ($value > 0) {
$content['deleted_tasks'] = '' . $value . '';
@@ -142,7 +158,7 @@ function outputAdvancedOverview (&$result_main) {
//
// Solved tasks
//
- $value = countSumTotalData('SOLVED', 'task_system', 'id', 'status', true, sprintf(" AND `assigned_admin`=%s", getCurrentAdminId()));
+ $value = countSumTotalData('SOLVED', 'task_system', 'id', 'status', TRUE, sprintf(" AND `assigned_admin`=%s", getCurrentAdminId()));
if ($value > 0) {
$content['solved_tasks'] = '' . $value . '';
@@ -151,7 +167,7 @@ function outputAdvancedOverview (&$result_main) {
//
// Your tasks
//
- $value = countSumTotalData(getCurrentAdminId(), 'task_system', 'id', 'assigned_admin', true, " AND `status`='NEW' AND task_type != 'EXTENSION_UPDATE'");
+ $value = countSumTotalData(getCurrentAdminId(), 'task_system', 'id', 'assigned_admin', TRUE, " AND `status`='NEW' AND task_type != 'EXTENSION_UPDATE'");
if ($value > 0) {
$content['your_tasks'] = '' . $value . '';
@@ -160,7 +176,7 @@ function outputAdvancedOverview (&$result_main) {
//
// Mails waiting to be approved
//
- $value = countSumTotalData('ADMIN', 'pool', 'id', 'data_type', true);
+ $value = countSumTotalData('ADMIN', 'pool', 'id', 'data_type', TRUE);
if ($value > 0) {
$content['pending_mails'] = '' . $value . '';
@@ -169,7 +185,7 @@ function outputAdvancedOverview (&$result_main) {
//
// Unfinished mail orders
//
- $value = countSumTotalData('TEMP', 'pool', 'id', 'data_type', true);
+ $value = countSumTotalData('TEMP', 'pool', 'id', 'data_type', TRUE);
if ($value > 0) {
$content['canceled_mails'] = '' . $value . '';
@@ -178,7 +194,7 @@ function outputAdvancedOverview (&$result_main) {
//
// Sent mail orders
//
- $value = countSumTotalData('SEND', 'pool', 'id', 'data_type', true);
+ $value = countSumTotalData('SEND', 'pool', 'id', 'data_type', TRUE);
if ($value > 0) {
$content['send_emails'] = '' . $value . '';
@@ -189,7 +205,7 @@ function outputAdvancedOverview (&$result_main) {
//
if (isExtensionActive('autopurge')) {
// Get auto-purged mails
- $value = countSumTotalData('DELETED', 'pool', 'id', 'data_type', true);
+ $value = countSumTotalData('DELETED', 'pool', 'id', 'data_type', TRUE);
if ($value > 0) {
$content['purged_mails'] = '' . $value . '';
@@ -200,19 +216,19 @@ function outputAdvancedOverview (&$result_main) {
//
if (isExtensionInstalledAndNewer('bonus', '0.1.8')) {
// Get auto-purged bonus mails
- $value = countSumTotalData('DELETED', 'bonus', 'id', 'data_type', true);
+ $value = countSumTotalData('DELETED', 'bonus', 'id', 'data_type', TRUE);
if ($value > 0) {
$content['purged_bonus_mails'] = '' . $value . '';
} // END - if
} elseif (isExtensionActive('bonus')) {
- $content['purged_bonus_mails'] = getMaskedMessage('ADMIN_EXTENSION_BONUS_OUTDATED', '0.1.8');
+ $content['purged_bonus_mails'] = '{%message,ADMIN_EXTENSION_BONUS_OUTDATED=0.1.8%}';
} else {
- $content['purged_bonus_mails'] = '{--ADMIN_EXTENSION_BONUS_404--}';
+ $content['purged_bonus_mails'] = '{--ADMIN_EXTENSION_BONUS_404--}';
}
} else {
- $content['purged_bonus_mails'] = '{--ADMIN_EXTENSION_AUTOPURGE_404--}';
- $content['purged_mails'] = '{--ADMIN_EXTENSION_AUTOPURGE_404--}';
+ $content['purged_bonus_mails'] = '{--ADMIN_EXTENSION_AUTOPURGE_404--}';
+ $content['purged_mails'] = '{--ADMIN_EXTENSION_AUTOPURGE_404--}';
}
//
@@ -220,57 +236,54 @@ function outputAdvancedOverview (&$result_main) {
//
if (isExtensionInstalledAndNewer('bonus', '0.1.8')) {
// Get sent bonus mails (but not notifications)
- $value = countSumTotalData('SEND', 'bonus', 'id', 'data_type', true, " AND `is_notify`='N'");
+ $value = countSumTotalData('SEND', 'bonus', 'id', 'data_type', TRUE, " AND `is_notify`='N'");
if ($value > 0) {
$content['send_bonus_mails'] = '' . $value . '';
} // END - if
} elseif (isExtensionActive('bonus')) {
- $content['send_bonus_mails'] = getMaskedMessage('ADMIN_EXTENSION_BONUS_OUTDATED', '0.1.8');
+ $content['send_bonus_mails'] = '{%message,ADMIN_EXTENSION_BONUS_OUTDATED=0.1.8%}';
} else {
$content['send_bonus_mails'] = '{--ADMIN_EXTENSION_BONUS_404--}';
}
- if (isExtensionActive('autopurge')) {
+ // Both extensions must be there
+ if ((isExtensionActive('autopurge')) && (isExtensionActive('user'))) {
// Start finding them...
- $EXCLUDE_LIST = '';
-
- // Check for more extensions
- // @TODO These can be rewritten to filter
- 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')) {
- // Recent ext-holiday found
- $EXCLUDE_LIST .= " AND d.`holiday_active`='N'";
+ $userExclusionSql = ' ';
+ $excludedUserids = runFilterChain('config_userid_exclusion_sql', array());
+ if (count($excludedUserids) > 0) {
+ // Exclude all
+ $userExclusionSql .= ' AND `d`.`userid` NOT IN (' . implode(', ', $excludedUserids) . ')';
} // END - if
// Check for all accounts
addSql("SELECT
- d.userid, d.email, d.last_online
+ `d`.`userid`,
+ `d`.`email`,
+ `d`.`last_online`
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', ' ' . $userExclusionSql) . "
ORDER BY
- d.userid ASC");
+ `d`.`userid` ASC");
$WHATs[] = 'list_autopurge';
$DESCRs[] = '{--ADMIN_TASK_INACTIVE_AUTOPURGE--}';
$TITLEs[] = '{--ADMIN_TASK_INACTIVE_AUTOPURGE_TITLE--}';
- }
+ } // END - if
- if (isExtensionInstalledAndNewer('sql_patches', '0.3.4')) {
- // Check for accounts without referal
- addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `refid`=0 ORDER BY `userid` ASC");
- $DESCRs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NOREF--}';
- $TITLEs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NOREFERAL_TITLE--}';
- $WHATs[] = 'list_user&mode=norefs';
- }
+ if ((isExtensionInstalledAndNewer('sql_patches', '0.3.4')) && (isExtensionActive('user'))) {
+ // Check for accounts without referral
+ addSql('SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `refid`=0 OR `refid` IS NULL ' . runFilterChain('user_exclusion_sql', ' ') . ' ORDER BY `userid` ASC');
+ $DESCRs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NO_REFERRAL--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NO_REFERRAL_TITLE--}';
+ $WHATs[] = 'list_user&do=norefs';
+ } // END - if
if (isExtensionActive('payout')) {
// List new payout requests
@@ -278,35 +291,27 @@ ORDER BY
$WHATs[] = 'list_payouts';
$DESCRs[] = '{--ADMIN_TASK_LIST_PAYOUTS_WAITING--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_PAYOUTS_WAITING_TITLE--}';
- addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_payouts` ORDER BY `userid` ASC");
+ addSql('SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_payouts` ORDER BY `userid` ASC');
$WHATs[] = 'list_payouts';
$DESCRs[] = '{--ADMIN_TASK_LIST_PAYOUTS_ALL--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_PAYOUTS_ALL_TITLE--}';
- }
+ } // END - if
if (isExtensionActive('wernis')) {
// List new wernis requests
- addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_wernis` ORDER BY `userid` ASC");
+ addSql('SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_wernis` ORDER BY `userid` ASC');
$WHATs[] = 'list_wernis';
$DESCRs[] = '{--ADMIN_TASK_LIST_WERNIS_ALL--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_WERNIS_ALL_TITLE--}';
- }
-
- if (isExtensionActive('primera')) {
- // List new primera requests
- addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_primera` ORDER BY `userid` ASC");
- $WHATs[] = 'list_primera';
- $DESCRs[] = '{--ADMIN_TASK_LIST_PRIMERA_ALL--}';
- $TITLEs[] = '{--ADMIN_TASK_LIST_PRIMERA_ALL_TITLE--}';
- }
+ } // END - if
if (isExtensionActive('holiday')) {
// List holiday requests
- addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_holidays` ORDER BY `userid` ASC");
+ addSql('SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_holidays` ORDER BY `userid` ASC');
$WHATs[] = 'list_holiday';
$DESCRs[] = '{--ADMIN_TASK_LIST_HOLIDAYS--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_HOLIDAYS_TITLE--}';
- }
+ } // END - if
if (isExtensionInstalledAndNewer('bonus', '0.8.7')) {
// List all notifications
@@ -316,53 +321,57 @@ ORDER BY
$TITLEs[] = '{--ADMIN_TASK_LIST_NOTIFICATIONS_TITLE--}';
} // END - if
- if (isExtensionInstalledAndNewer('bonus', '0.2.3')) {
- // Active rallye
- if (isExtensionInstalledAndNewer('bonus', '0.6.9')) {
- // Add more bonus points here
- $USE = '(0';
- if (getConfig('bonus_click_yn') == 'Y') $USE .= ' + `turbo_bonus`';
- if (getConfig('bonus_login_yn') == 'Y') $USE .= ' + `login_bonus`';
- if (getConfig('bonus_order_yn') == 'Y') $USE .= ' + `bonus_order`';
- if (getConfig('bonus_stats_yn') == 'Y') $USE .= ' + `bonus_stats`';
- if (getConfig('bonus_ref_yn') == 'Y') $USE .= ' + `bonus_ref`';
- $USE .= ')';
- } else {
- // Old version ???
- $USE = 'turbo_bonus';
- }
+ // Both extensions must be there
+ if ((isExtensionInstalledAndNewer('bonus', '0.2.3')) && (isExtensionActive('user'))) {
+ // Get more columns
+ $add = trim(runFilterChain('add_bonus_points_user_columns', ''));
- // Autopurge installed?
+ // Active rallye, so add more point columns, if not empty
+ $pointsColumns = '';
+ if (!empty($add)) {
+ $pointsColumns = '(0' . $add . ')';
+ } // END - if
+
+ // Init variable
$lastOnline = '';
- if ((isExtensionActive('autopurge')) && (getConfig('autopurge_inactive') == 'Y') && (getApInactiveSince() > 0)) {
+
+ // Autopurge installed?
+ if ((isExtensionActive('autopurge')) && (isAutopurgeInactiveEnabled()) && (getApInactiveSince() > 0)) {
// Use last online timestamp to keep inactive members away from here
- $lastOnline = ' AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})';
+ $lastOnline = ' AND (UNIX_TIMESTAMP() - `last_online`) < {?ap_inactive_since?}';
} // END - if
- addSql("SELECT
- " . $USE . " AS points
+ // Is it empty?
+ if (!empty($ointsColumns)) {
+ // No, then add it
+ addSql("SELECT
+ " . $pointsColumns . " AS `points`
FROM
`{?_MYSQL_PREFIX?}_user_data`
WHERE
`status`='CONFIRMED' AND
- " . $USE . " > 0
+ " . $pointsColumns . " > 0
" . $lastOnline . "
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
- if (isExtensionInstalledAndNewer('beg', '0.1.2')) {
- // Begging rallye
+ // Again both extensions must be there
+ if ((isExtensionInstalledAndNewer('beg', '0.1.2')) && (isExtensionActive('user'))) {
+ // ----- Begging rallye -----
- // Autopurge installed?
+ // Init variable
$lastOnline = '';
- if ((isExtensionActive('autopurge')) && (getConfig('autopurge_inactive') == 'Y') && (getApInactiveSince() > 0)) {
+
+ // Autopurge installed?
+ if ((isExtensionActive('autopurge')) && (isAutopurgeInactiveEnabled()) && (getApInactiveSince() > 0)) {
// Use last online timestamp to keep inactive members away from here
- $lastOnline = ' AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})';
+ $lastOnline = ' AND (UNIX_TIMESTAMP() - `last_online`) < {?ap_inactive_since?}';
} // END - if
addSql("SELECT
@@ -384,25 +393,25 @@ ORDER BY
if (isExtensionActive('doubler')) {
// List waiting payouts
addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_doubler` WHERE `completed`='N' ORDER BY `id` ASC");
- $WHATs[] = 'list_doubler&mode=waiting&select=all';
+ $WHATs[] = 'list_doubler&do=waiting&select=all';
$DESCRs[] = '{--ADMIN_TASK_LIST_DOUBLER_WAITING--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_DOUBLER_WAITING_TITLE--}';
- addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_doubler` ORDER BY `id` ASC");
+ addSql('SELECT `id` FROM `{?_MYSQL_PREFIX?}_doubler` ORDER BY `id` ASC');
$WHATs[] = 'list_doubler';
$DESCRs[] = '{--ADMIN_TASK_LIST_DOUBLER_ALL--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_DOUBLER_ALL_TITLE--}';
} // END - if
//
- // All referal banner
+ // All referral banner
//
- addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_refbanner` ORDER BY `id` ASC");
+ addSql('SELECT `id` FROM `{?_MYSQL_PREFIX?}_refbanner` ORDER BY `id` ASC');
$WHATs[] = 'refbanner';
$DESCRs[] = '{--ADMIN_TASK_LIST_REFBANNER_ALL--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_REFBANNER_ALL_TITLE--}';
//
- // All activated referal banner
+ // All activated referral banner
//
addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_refbanner` WHERE `visible`='Y' ORDER BY `id` ASC");
$WHATs[] = 'refbanner';
@@ -412,7 +421,7 @@ ORDER BY
//
// All extensions
//
- addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_extensions` ORDER BY `id` ASC");
+ addSql('SELECT `id` FROM `{?_MYSQL_PREFIX?}_extensions` ORDER BY `id` ASC');
$WHATs[] = 'extensions';
$DESCRs[] = '{--ADMIN_TASK_LIST_EXTENSIONS_ALL--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_EXTENSIONS_ALL_TITLE--}';
@@ -425,35 +434,9 @@ ORDER BY
$DESCRs[] = '{--ADMIN_TASK_LIST_EXTENSIONS_ACTIVE--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_EXTENSIONS_ACTIVE_TITLE--}';
- if (isExtensionActive('engine')) {
- // List all export accounts
- addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_engine_accounts` ORDER BY `id` ASC");
- $WHATs[] = 'list_engine';
- $DESCRs[] = '{--ADMIN_TASK_LIST_ENGINE--}';
- $TITLEs[] = '{--ADMIN_TASK_LIST_ENGINE_TITLE--}';
-
- // List all pending accounts
- addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_engine_accounts` WHERE `status`='UNCONFIRMED' ORDER BY `id` ASC");
- $WHATs[] = 'unlock_engine';
- $DESCRs[] = '{--ADMIN_TASK_UNLOCK_ENGINE--}';
- $TITLEs[] = '{--ADMIN_TASK_UNLOCK_ENGINE_TITLE--}';
-
- // List all safes
- addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_engine_safe` ORDER BY `id` ASC");
- $WHATs[] = 'list_engine&mode=safe';
- $DESCRs[] = '{--ADMIN_TASK_LIST_ENGINE_SAFES--}';
- $TITLEs[] = '{--ADMIN_TASK_LIST_ENGINE_SAFES_TITLE--}';
-
- // List all export URLs
- addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_engine_urls` ORDER BY `id` ASC");
- $WHATs[] = 'engine_urls';
- $DESCRs[] = '{--ADMIN_TASK_LIST_ENGINE_URLS--}';
- $TITLEs[] = '{--ADMIN_TASK_LIST_ENGINE_URLS_TITLE--}';
- } // END - if
-
if (isExtensionActive('sponsor')) {
// List all sponsors
- addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_sponsor_data` ORDER BY `id` ASC");
+ addSql('SELECT `id` FROM `{?_MYSQL_PREFIX?}_sponsor_data` ORDER BY `id` ASC');
$WHATs[] = 'list_sponsor';
$DESCRs[] = '{--ADMIN_TASK_LIST_SPONSOR--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_SPONSOR_TITLE--}';
@@ -491,7 +474,7 @@ ORDER BY
if (isExtensionActive('country')) {
// List country codes
- addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_countries` ORDER BY `id` ASC");
+ addSql('SELECT `id` FROM `{?_MYSQL_PREFIX?}_countries` ORDER BY `id` ASC');
$WHATs[] = 'list_country';
$DESCRs[] = '{--ADMIN_TASK_LIST_COUNTRY--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_COUNTRY_TITLE--}';
@@ -499,7 +482,7 @@ ORDER BY
if (isExtensionActive('theme')) {
// List all themes
- addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_themes` ORDER BY `id` ASC");
+ addSql('SELECT `id` FROM `{?_MYSQL_PREFIX?}_themes` ORDER BY `id` ASC');
$WHATs[] = 'theme_edit';
$DESCRs[] = '{--ADMIN_TASK_LIST_THEME_ALL--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_THEME_ALL_TITLE--}';
@@ -513,7 +496,7 @@ ORDER BY
if (isExtensionActive('admins')) {
// List all administrator logins
- addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `id` ASC");
+ addSql('SELECT `id` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `id` ASC');
$WHATs[] = 'admins_edit';
$DESCRs[] = '{--ADMIN_TASK_LIST_ADMINS_ALL--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_ADMINS_ALL_TITLE--}';
@@ -521,7 +504,7 @@ ORDER BY
if (isExtensionActive('surfbar')) {
// List all URLs in surfbar
- addSql("SELECT `url_id` FROM `{?_MYSQL_PREFIX?}_surfbar_urls` ORDER BY `url_id` ASC");
+ addSql('SELECT `url_id` FROM `{?_MYSQL_PREFIX?}_surfbar_urls` ORDER BY `url_id` ASC');
$WHATs[] = 'list_surfbar_urls';
$DESCRs[] = '{--ADMIN_TASK_LIST_SURFBAR_URLS_ALL--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_SURFBAR_URLS_ALL_TITLE--}';
@@ -533,17 +516,41 @@ ORDER BY
$TITLEs[] = '{--ADMIN_TASK_LIST_SURFBAR_URLS_PENDING_TITLE--}';
} // END - if
+ 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--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_SERVER_NAME_LOG_TITLE--}';
+ $WHATs[] = 'list_server_name';
+ } // END - if
+
+ if (isExtensionInstalled('network')) {
+ // Check for HTTP logging entries
+ addSql('SELECT `network_header_id` FROM `{?_MYSQL_PREFIX?}_network_header_logging`');
+ $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
$EXTRAS .= createExtraTaskRows($WHATs, $DESCRs, $TITLEs);
// If empty just keep a forced-space left for CSS issues
- if (empty($EXTRAS)) $EXTRAS = ' ';
+ if (empty($EXTRAS)) {
+ $EXTRAS = ' ';
+ } // END - if
// Add compiled string to constant for final template
$content['extra_table'] = $EXTRAS;
// Simply load the template... :-)
- loadTemplate('admin_overview_task', false, $content);
+ loadTemplate('admin_overview_task', FALSE, $content);
}
//
@@ -556,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(
@@ -565,28 +572,30 @@ function createExtraTaskRows ($WHATs, $DESCRs, $TITLEs) {
);
// Rewrite CSS class if not last entry is reached
- if ($key < (count($sqls) - 1)) $content['bottom'] = 'bottom';
+ if ($key < (count($sqls) - 1)) {
+ $content['bottom'] = 'bottom';
+ } // END - if
- if ((SQL_NUMROWS($result) > 0) && (!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);
+ $OUT .= loadTemplate('admin_overview_task_rows', TRUE, $content);
} // END- foreach
} // END - foreach
// Return output in the template
- return loadTemplate('admin_overview_task_extras', true, $OUT);
+ return loadTemplate('admin_overview_task_extras', TRUE, $OUT);
}
-//
+// [EOF]
?>