$USE = '`turbo_bonus`';
}
+ // Init variables
+ $lastOnline = '';
+
// Autopurge installed?
- $lastOnline = '%s'; $ONLINE = '';
- if (isExtensionActive('autopurge')) {
+ if ((isExtensionActive('autopurge')) && ((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
// Check if at least one is in the active rallye
- $result = SQL_QUERY_ESC("SELECT
- `userid`, `email`, `gender`, `surname`, `family`, ".$USE." AS `points`, `last_online`
+ $result = SQL_QUERY("SELECT
+ `userid`, `email`, `gender`, `surname`, `family`, " . $USE . " AS `points`, `last_online`
FROM
`{?_MYSQL_PREFIX?}_user_data`
WHERE
`status`='CONFIRMED' AND
- ".$USE." > 0
- ".$lastOnline."
+ " . $USE . " > 0
+ " . $lastOnline . "
ORDER BY
`points` DESC,
`last_online` DESC,
- `userid` ASC",
- array($ONLINE), __FILE__, __LINE__);
+ `userid` ASC", __FILE__, __LINE__);
if (!SQL_HASZERONUMS($result)) {
// List users
$content['last_online'] = generateDateTime($content['last_online'], 2);
$content['win1'] = $WIN1;
$content['win2'] = $WIN2;
- $content['cnt'] = $count;
+ $content['count'] = $count;
// Load template and add it
$OUT .= loadTemplate('admin_list_bonus_rows', true, $content);
} // END - while
$content['rows'] = $OUT;
- $content['total'] = $total;
+ $content['total_points'] = $total;
// Check if we need to display form or not with manuel withdraw
if (getLastMonth() == getMonth()) {
// Prepare constant for timemark
// @TODO Can't this be moved into our expression language?
if (isExtensionActive('autopurge')) {
- $content['autopurge_timeout'] = generateDateTime(time() - getApInactiveSince(), 2);
+ $content['autopurge_timeout'] = '{%message,ADMIN_BONUS_TIMEOUT=' . generateDateTime(time() - getApInactiveSince(), 2) . '%}';
} else {
- $content['autopurge_timeout'] = generateExtensionInactiveNotInstalledMessage('autopurge');
+ $content['autopurge_timeout'] = '{%pipe,generateExtensionInactiveNotInstalledMessage=autopurge%}';
}
// Load final template