} // 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'] = '<a href="{%url=modules.php?module=admin&what=list_task&type=updates%}">' . $value . '</a>';
// Unconfirmed accounts
$value = getTotalUnconfirmedUser();
if ($value > 0) {
- $content['unconfirmed_members'] = '<a href="{%url=modules.php?module=admin&what=list_user&status=UNCONFIRMED%}">' . $value . '</a>';
+ $content['unconfirmed_members'] = '<a href="{%url=modules.php?module=admin&what=list_user&status=unconfirmed%}">' . $value . '</a>';
} // END - if
// Locked accounts
//
// 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'] = '<a href="{%url=modules.php?module=admin&what=list_task&type=unassigned%}">' . $value . '</a>';
//
// Closed tasks
//
- $value = countSumTotalData('CLOSED', 'task_system', 'id', 'status', true);
+ $value = countSumTotalData('CLOSED', 'task_system', 'id', 'status', TRUE);
if ($value > 0) {
$content['closed_tasks'] = '<a href="{%url=modules.php?module=admin&what=list_task&type=closed%}">' . $value . '</a>';
//
// Deleted tasks
//
- $value = countSumTotalData('DELETED', 'task_system', 'id', 'status', true);
+ $value = countSumTotalData('DELETED', 'task_system', 'id', 'status', TRUE);
if ($value > 0) {
$content['deleted_tasks'] = '<a href="{%url=modules.php?module=admin&what=list_task&type=deleted%}">' . $value . '</a>';
//
// 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'] = '<a href="{%url=modules.php?module=admin&what=list_task&type=solved%}">' . $value . '</a>';
//
// 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'] = '<a href="{%url=modules.php?module=admin&what=list_task%}">' . $value . '</a>';
//
// 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'] = '<a href="{%url=modules.php?module=admin&what=unlock_emails%}">' . $value . '</a>';
//
// 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'] = '<a href="{%url=modules.php?module=admin&what=email_details%}">' . $value . '</a>';
//
// 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'] = '<a href="{%url=modules.php?module=admin&what=email_archiv%}">' . $value . '</a>';
//
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'] = '<a href="{%url=modules.php?module=admin&what=email_details%}">' . $value . '</a>';
//
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'] = '<a href="{%url=modules.php?module=admin&what=email_details%}">' . $value . '</a>';
//
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'] = '<a href="{%url=modules.php?module=admin&what=email_details%}">' . $value . '</a>';
// Both extensions must be there
if ((isExtensionActive('autopurge')) && (isExtensionActive('user'))) {
// Start finding them...
- $EXCLUDE_LIST = ' ';
+ $userExclusionSql = ' ';
+
+ // Exclude test accounts
+ $userExclusionSql = runFilterChain('user_exclusion_sql', ' ');
// 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 (isValidId(getDefRefid())) $userExclusionSql .= ' AND d.`userid` != {?def_refid?}';
+ if (isExtensionActive('beg')) $userExclusionSql .= ' AND d.`userid` != {?beg_userid?}';
+ if (isExtensionActive('bonus')) $userExclusionSql .= ' AND d.`userid` != {?bonus_userid?}';
+ if (isExtensionActive('doubler')) $userExclusionSql .= ' AND d.`userid` != {?doubler_userid?}';
if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
// Recent ext-holiday found
- $EXCLUDE_LIST .= " AND d.`holiday_active`='N'";
- } // END - if
- if (isExtensionInstalledAndNewer('user', '0.5.0')) {
- // Exclude test accounts
- $EXCLUDE_LIST = runFilterChain('user_exclusion_sql', $EXCLUDE_LIST);
+ $userExclusionSql .= " AND d.`holiday_active`='N'";
} // END - if
// Check for all accounts
d.`email`,
d.`last_online`
FROM
- `{?_MYSQL_PREFIX?}_user_data` AS d
+ `{?_MYSQL_PREFIX?}_user_data` AS `d`
WHERE
- d.`status`='CONFIRMED'
- " . runFilterChain('user_exclusion_sql', ' ') . " AND
+ 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?}
-".$EXCLUDE_LIST."
+" . $userExclusionSql . "
ORDER BY
d.`userid` ASC");
$WHATs[] = 'list_autopurge';
$add = runFilterChain('add_bonus_points_user_columns', '');
// Active rallye, so add more point columns, if not empty
- $pointsColumns = '`turbo_bonus`';
+ $pointsColumns = '';
if (!empty($add)) {
$pointsColumns = '(0' . $add . ')';
} // END - if
$TITLEs[] = '{--ADMIN_TASK_LIST_SURFBAR_URLS_PENDING_TITLE--}';
} // END - if
+ if (isExtensionInstalledAndNewer('sql_patches', '0.9.2')) {
+ // 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';
+ } // END - if
+
// Generate extra overview rows
$EXTRAS .= createExtraTaskRows($WHATs, $DESCRs, $TITLEs);
$content['extra_table'] = $EXTRAS;
// Simply load the template... :-)
- loadTemplate('admin_overview_task', false, $content);
+ loadTemplate('admin_overview_task', FALSE, $content);
}
//
SQL_FREERESULT($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]