More queries now depends on UNIX_TIMESTAMP() not on time(), more fixes for not instal...

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

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index c00a486e606ad53b5e7c1ca22f3d4d5de110a25d..0c5f9dd64ac25371b25515b00461b1bcb3baec8c 100644 (file)
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -50,8 +50,7 @@ if (($curr != $_CONFIG['last_month']) && ($_CONFIG['bonus_ranks'] > 0) && ($CSS
 {
        // Extension "autopurge" is inactive or purging of inactive accounts is deactivated
        $whereStatement1 = "WHERE status='CONFIRMED'";
-       $whereStatement2 = 0;
-       $whereStatement3 = bigintval($_CONFIG['bonus_ranks']);
+       $whereStatement2 = bigintval($_CONFIG['bonus_ranks']);
 
        // Shall I keep inactive members away from here? (mostly wanted in an "active-rallye" ...)
        if (EXT_IS_ACTIVE("autopurge"))
@@ -60,27 +59,29 @@ if (($curr != $_CONFIG['last_month']) && ($_CONFIG['bonus_ranks'] > 0) && ($CSS
                if ($_CONFIG['ap_inactive_since'] > 0)
                {
                        // Okay, include last online timestamp
-                       $whereStatement1 = "WHERE status='CONFIRMED' AND last_online >=";
-                       $whereStatement2 = bigintval(time() - $_CONFIG['ap_inactive_since']);
-                       $whereStatement3 = bigintval($_CONFIG['bonus_ranks']);
+                       $whereStatement1 = sprintf("WHERE status='CONFIRMED' AND last_online >= (UNIX_TIMESTAMP() - %s)", $_CONFIG['ap_inactive_since']);
+                       $whereStatement2 = bigintval($_CONFIG['bonus_ranks']);
                }
        }
 
        // Add more bonus points here
-       $ADD = " AND (0";
+       $ADD = "";
        if ($_CONFIG['bonus_click_yn'] == "Y") $ADD .= " + turbo_bonus";
        if ($_CONFIG['bonus_login_yn'] == "Y") $ADD .= " + login_bonus";
        if ($_CONFIG['bonus_order_yn'] == "Y") $ADD .= " + bonus_order";
        if ($_CONFIG['bonus_stats_yn'] == "Y") $ADD .= " + bonus_stats";
        if ($_CONFIG['bonus_ref_yn']   == "Y") $ADD .= " + bonus_ref";
-       $ADD .= ") > 0";
+
+       if (!empty($ADD)) {
+               $ADD .= "AND (0".$ADD.") > 0";
+       } // END - if
 
        // SQL string to check for accounts
        $result_main = SQL_QUERY_ESC("SELECT userid, email, (turbo_bonus + login_bonus + bonus_order + bonus_stats + bonus_ref) AS active_bonus
 FROM "._MYSQL_PREFIX."_user_data
 ".$whereStatement1." %s".$ADD."
 ORDER BY active_bonus DESC, userid LIMIT %s",
- array($whereStatement2, $whereStatement3), __FILE__, __LINE__);
+ array($whereStatement2), __FILE__, __LINE__);
 
        if (SQL_NUMROWS($result_main) > 0)
        {