* $Author:: $ *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team *
* For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
// Some security stuff...
if (!defined('__SECURITY')) {
die();
-} elseif ((isCssOutputMode()) || (!isResetModeEnabled())) {
- // Do not execute when script is in CSS mode or no hourly reset
+} elseif ((!isHtmlOutputMode()) || (!isMonthlyResetEnabled())) {
+ // Do not execute when script is in non-HTML mode or no hourly reset
return;
} elseif (!isExtensionActive('bonus')) {
- logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension disabled.');
+ if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-bonus disabled.');
return;
}
//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Monthly reset started.');
if ((getBonusRanks() > 0) && (!isCssOutputMode())) {
- // Extension 'autopurge' is inactive or purging of inactive accounts is deactivated
- $whereStatement = "WHERE `status`='CONFIRMED'";
+ // Extension 'autopurge' is inactive or purging of inactive accounts is deactivated\
+ $whereStatement = runFilterChain('user_exclusion_sql', "WHERE `status`='CONFIRMED'");
// Shall I keep inactive members away from here? (mostly wanted in an "active-rallye" ...)
+ // @TODO Rewrite these if() blocks to a filter
if ((isExtensionActive('autopurge')) && ((getApInactiveSince() > 0))) {
// Okay, include last online timestamp
- $whereStatement .= ' AND (UNIX_TIMESTAMP() - `last_online`) < {?ap_inactive_since?}';
+ $whereStatement .= ' AND (UNIX_TIMESTAMP() - `d`.`last_online`) < {?ap_inactive_since?}';
+ } // END - if
+
+ // Is ext-holiday installed?
+ if (isExtensionActive('holiday')) {
+ // Exclude those as well
+ $whereStatement .= " AND `d`.`holiday_active`='N'";
} // END - if
// Add more bonus points here by running a filter
// Run SQL string to check for accounts
$result_main = SQL_QUERY('SELECT
- `userid`,`email`,`gender`,`surname`,`family`, (0' . $add . ') AS `points`
+ `d`.`userid`,
+ (0' . $add . ') AS `points`
FROM
- `{?_MYSQL_PREFIX?}_user_data`
+ `{?_MYSQL_PREFIX?}_user_data` AS `d`
' . $whereStatement . '
ORDER BY
- `points` DESC,
- `userid` ASC
+ `d`.`points` DESC,
+ `d`.`userid` ASC
LIMIT {?bonus_ranks?}', __FILE__, __LINE__);
// Some entries were found?