Extension ext-coupon basicly finished, no shortcuts in naming:

[mailer.git] / inc / monthly / monthly_bonus.php

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index acbe511eece9fd43816d51104c6b4aa4b98feeba..a4b8f85652420ac6e163c4a203929edef8d6fb42 100644 (file)
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -39,7 +39,7 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif ((isCssOutputMode()) || (!isResetModeEnabled())) {
-       // Do not execute when script is in CSS mode or no daily reset
+       // Do not execute when script is in CSS mode or no hourly reset
        return;
 } elseif (!isExtensionActive('bonus')) {
        logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension disabled.');
@@ -51,15 +51,12 @@ if (!defined('__SECURITY')) {
 
 if ((getConfig('bonus_ranks') > 0) && (!isCssOutputMode())) {
        // Extension 'autopurge' is inactive or purging of inactive accounts is deactivated
-       $whereStatement1 = "WHERE `status`='CONFIRMED'";
+       $whereStatement = "WHERE `status`='CONFIRMED'";
 
        // Shall I keep inactive members away from here? (mostly wanted in an "active-rallye" ...)
-       if (isExtensionActive('autopurge')) {
-               // Use last online stamp only when autopurge for inactive members is activated
-               if (getApInactiveSince() > 0) {
-                       // Okay, include last online timestamp
-                       $whereStatement1 = "WHERE `status`='CONFIRMED' AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})";
-               } // END - if
+       if ((isExtensionActive('autopurge')) && ((getApInactiveSince() > 0))) {
+               // Okay, include last online timestamp
+               $whereStatement .= ' AND (UNIX_TIMESTAMP() - `last_online`) >= {?ap_inactive_since?}';
        } // END - if
 
        // Add more bonus points here
@@ -73,15 +70,15 @@ if ((getConfig('bonus_ranks') > 0) && (!isCssOutputMode())) {
 
        // Shall we add some entries?
        if (!empty($add)) {
-               $whereStatement1 .= ' AND (0' . $add . ') > 0';
+               $whereStatement .= ' AND (0' . $add . ') > 0';
        } // END - if
 
        // Run SQL string to check for accounts
        $result_main = SQL_QUERY('SELECT
-       `userid`, `email`, `gender`, `surname`, `family`, (0' . $add . ') AS points
+       `userid`, `email`, `gender`, `surname`, `family`, (0' . $add . ') AS `points`
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
-' . $whereStatement1 . '
+' . $whereStatement . '
 ORDER BY
        `points` DESC,
        `userid` ASC