Some fixes for monthly mails

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

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index 2b18fb308db7ce2fff6269027a4b52dd15becf39..de9bf0b9ccc0002156d19666c5702dd9040f8ee1 100644 (file)
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -46,23 +46,20 @@ if (($CSS == 1) || (!defined('__DAILY_RESET'))) return;
 // Get current month (2 digits)
 $curr = date("m", time());
 
-if (($curr != $_CONFIG['last_month']) && ($_CONFIG['bonus_ranks'] > 0) && ($CSS != 1))
-{
+if (($curr != $_CONFIG['last_month']) && ($_CONFIG['bonus_ranks'] > 0) && ($CSS != 1)) {
        // Extension "autopurge" is inactive or purging of inactive accounts is deactivated
        $whereStatement1 = "WHERE status='CONFIRMED'";
        $whereStatement2 = bigintval($_CONFIG['bonus_ranks']);
 
        // Shall I keep inactive members away from here? (mostly wanted in an "active-rallye" ...)
-       if (EXT_IS_ACTIVE("autopurge"))
-       {
+       if (EXT_IS_ACTIVE("autopurge")) {
                // Use last online stamp only when autopurge for inactive members is activated
-               if ($_CONFIG['ap_inactive_since'] > 0)
-               {
+               if ($_CONFIG['ap_inactive_since'] > 0) {
                        // Okay, include last online timestamp
                        $whereStatement1 = sprintf("WHERE status='CONFIRMED' AND last_online >= (UNIX_TIMESTAMP() - %s)", $_CONFIG['ap_inactive_since']);
                        $whereStatement2 = bigintval($_CONFIG['bonus_ranks']);
-               }
-       }
+               } // END - if
+       } // END - if
 
        // Add more bonus points here
        $ADD = "";
@@ -77,45 +74,37 @@ if (($curr != $_CONFIG['last_month']) && ($_CONFIG['bonus_ranks'] > 0) && ($CSS
        } // 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
+       $result_main = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, (turbo_bonus + login_bonus + bonus_order + bonus_stats + bonus_ref) AS points
 FROM "._MYSQL_PREFIX."_user_data
 ".$whereStatement1."".$ADD."
 ORDER BY active_bonus DESC, userid LIMIT %s",
  array($whereStatement2), __FILE__, __LINE__);
 
-       if (SQL_NUMROWS($result_main) > 0)
-       {
+       if (SQL_NUMROWS($result_main) > 0) {
                // Load our winners...
-               $UIDs = "";
-               while(list($uid, $email, $points) = SQL_FETCHROW($result_main))
-               {
-                       // Add userids in a row
-                       $UIDs .= ",'".$uid."'";
-
-                       // Add points to user's account directly
-                       ADD_POINTS_REFSYSTEM($uid, $points, false, "0", false, "direct");
-
-                       // Load email template and email it away
-                       $msg = LOAD_EMAIL_TEMPLATE("member_bonus", $points, bigintval($uid));
-                       SEND_EMAIL($email, BONUS_MONTHLY_ONLINE_BONUS, $msg);
-               }
+               while ($content = SQL_FETCHARRAY($result_main)) {
+                       // Make sure zero points are not mailed
+                       if ($content['points'] > 0) {
+                               // Add points to user's account directly
+                               ADD_POINTS_REFSYSTEM($content['uid'], $content['points'], false, "0", false, "direct");
 
-               // Remove first commata
-               $UIDs = substr($UIDs, 1);
+                               // Translate gender
+                               $content['gender'] = TRANSLATE_GENDER($content['gender']);
 
-               // Get current month
-               $curr = date("m", time());
-               if (strlen($curr) == 1) $curr = "0".$curr;
-               if ($curr == "00") $curr = "12";
+                               // Load email template and email it away
+                               $msg = LOAD_EMAIL_TEMPLATE("member_bonus", $content['points'], bigintval($content['uid']));
+                               SEND_EMAIL($content['email'], BONUS_MONTHLY_ONLINE_BONUS, $msg);
+                       } // END - if
+               } // END - while
 
                // Reset accounts
                $result = SQL_QUERY("UPDATE "._MYSQL_PREFIX."_user_data
 SET turbo_bonus=0, login_bonus=0, bonus_order=0, bonus_stats=0, bonus_ref=0", __FILE__, __LINE__);
-       }
+       } // END - if
 
        // Free memory
        SQL_FREERESULT($result_main);
-}
+} // END - if
 
 //
 ?>