Some fixes for monthly mails

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

diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index 2a78b37a0df87c4d0295626ecde4b900cc0ef4f1..a96f75673f812ead1a0a4e9a658d9f6a0fe77a5c 100644 (file)
--- a/inc/monthly/monthly_beg.php
+++ b/inc/monthly/monthly_beg.php
@@ -47,26 +47,23 @@ if (($CSS == 1) || (!defined('__DAILY_RESET')) || ($_CONFIG['beg_rallye'] == "N"
 $curr = date("m", time());
 
 // Check if month is done
 $curr = date("m", time());
 
 // Check if month is done

-if (($curr != $_CONFIG['last_month']) && ($_CONFIG['last_month'] > 0) && ($_CONFIG['beg_ranks'] > 0) && ($CSS != 1))
-{
+if (($curr != $_CONFIG['last_month']) && ($_CONFIG['last_month'] > 0) && ($_CONFIG['beg_ranks'] > 0) && ($CSS != 1)) {

        // Extension "autopurge" is inactive or purging of inactive accounts is deactivated
        $whereStatement1 = "";
        $whereStatement2 = bigintval($_CONFIG['beg_ranks']);
 
        // Let's check if there are some points left we can "pay"...
        // Extension "autopurge" is inactive or purging of inactive accounts is deactivated
        $whereStatement1 = "";
        $whereStatement2 = bigintval($_CONFIG['beg_ranks']);
 
        // Let's check if there are some points left we can "pay"...

-       if (EXT_IS_ACTIVE("autopurge"))
-       {
+       if (EXT_IS_ACTIVE("autopurge")) {

                // Use last online stamp only when autopurge for inactive members is activated
                // Use last online stamp only when autopurge for inactive members is activated

-               if (($_CONFIG['ap_inactive_since'] > 0) && ($_CONFIG['beg_active'] == "Y"))
-               {
+               if (($_CONFIG['ap_inactive_since'] > 0) && ($_CONFIG['beg_active'] == "Y")) {

                        // Okay, include last online timestamp
                        $whereStatement1 = sprintf("AND last_online >= (UNIX_TIMESTAMP() - %s)", bigintval($_CONFIG['ap_inactive_since']));;
                        $whereStatement2 = bigintval($_CONFIG['beg_ranks']);
                        // Okay, include last online timestamp
                        $whereStatement1 = sprintf("AND last_online >= (UNIX_TIMESTAMP() - %s)", bigintval($_CONFIG['ap_inactive_since']));;
                        $whereStatement2 = bigintval($_CONFIG['beg_ranks']);

-               }
-       }
+               } // END - if
+       } // END - if

 
        // SQL string to check for accounts
 
        // SQL string to check for accounts

-       $result_main = SQL_QUERY_ESC("SELECT userid, email, beg_points
+       $result_main = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, beg_points AS points

 FROM "._MYSQL_PREFIX."_user_data
 WHERE status='CONFIRMED' ".$whereStatement1." AND beg_points > 0
 ORDER BY beg_points DESC, userid
 FROM "._MYSQL_PREFIX."_user_data
 WHERE status='CONFIRMED' ".$whereStatement1." AND beg_points > 0
 ORDER BY beg_points DESC, userid


@@ -75,31 +72,25 @@ LIMIT %s",
 
        if (SQL_NUMROWS($result_main) > 0) {
                // Load our winners...
 
        if (SQL_NUMROWS($result_main) > 0) {
                // Load our winners...

-               $UIDs = "";
-               while(list($uid, $email, $points) = SQL_FETCHROW($result_main)) {
+               while ($content = SQL_FETCHARRAY($result_main)) {

                        // Add points to user's account directly
                        // Add points to user's account directly

-                       ADD_POINTS_REFSYSTEM($uid, $points, false, "0", false, "direct");
+                       ADD_POINTS_REFSYSTEM($content['uid'], $content['points'], false, "0", false, "direct");

 
 

-                       // Load email template and email it away
-                       $msg = LOAD_EMAIL_TEMPLATE("member_beg", $points, bigintval($uid));
-                       SEND_EMAIL($email, BEG_MONTHLY_RALLYE, $msg);
-               }
-
-               // 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_beg", $content, bigintval($content['uid']));
+                       SEND_EMAIL($content['email'], BEG_MONTHLY_RALLYE, $msg);
+               } // END - while

 
                // Reset accounts
                $result = SQL_QUERY("UPDATE "._MYSQL_PREFIX."_user_data SET beg_points=0.00000 WHERE beg_points > 0", __FILE__, __LINE__);
 
                // Reset accounts
                $result = SQL_QUERY("UPDATE "._MYSQL_PREFIX."_user_data SET beg_points=0.00000 WHERE beg_points > 0", __FILE__, __LINE__);

-       }
+       } // END - if

 
        // Free memory
        SQL_FREERESULT($result_main);
 
        // Free memory
        SQL_FREERESULT($result_main);

-}
+} // END - if

 
 //
 ?>
 
 //
 ?>