Extension ext-coupon continued, a lot improvements applied:

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

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index ca916cb6bc5cffa5d892d51261882d19732c1a93..a4b8f85652420ac6e163c4a203929edef8d6fb42 100644 (file)
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -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,7 +70,7 @@ 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
@@ -81,7 +78,7 @@ if ((getConfig('bonus_ranks') > 0) && (!isCssOutputMode())) {
        `userid`, `email`, `gender`, `surname`, `family`, (0' . $add . ') AS `points`
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
-' . $whereStatement1 . '
+' . $whereStatement . '
 ORDER BY
        `points` DESC,
        `userid` ASC