$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`,
(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';
// 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 = '';
$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`
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'))) {
$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