Template fixed

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

diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index 35e62117a947beb87b69548936c842cbb36f6148..f9019b0cc0fb78bc057bee2046c475c9bb9f4950 100644 (file)
--- a/inc/monthly/monthly_beg.php
+++ b/inc/monthly/monthly_beg.php
@@ -35,79 +35,63 @@
 if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
-} elseif ((!EXT_IS_ACTIVE("beg")) && (!IS_ADMIN())) {
-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "beg");
+} elseif (!EXT_IS_ACTIVE("beg")) {
        return;
 }
 
 // Do not execute when script is in CSS mode or no daily reset
 if (($CSS == 1) || (!defined('__DAILY_RESET')) || ($_CONFIG['beg_rallye'] == "N")) return;
+//* DEBUG: */ echo basename(__FILE__)."<br />\n";
 
 // Get current month (2 digits)
 $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"...
-       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) && ($_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']));;
+                       $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
-       $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
+WHERE status='CONFIRMED'".$whereStatement1." AND beg_points > 0
 ORDER BY beg_points DESC, userid
 LIMIT %s",
                array($whereStatement2), __FILE__, __LINE__);
 
        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
-                       $result_data = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_points
-SET points=points+%s WHERE ref_depth=0 AND userid=%s LIMIT 1",
- array($points, bigintval($uid)), __FILE__, __LINE__);
+                       ADD_POINTS_REFSYSTEM("monthly_beg", $content['userid'], $content['points'], false, "0", false, "direct");
 
-                       // Update mediadata as well
-                       if (GET_EXT_VERSION("mediadata") >= "0.0.4") {
-                               // Update database
-                               MEDIA_UPDATE_ENTRY(array("total_points"), "add", $points);
-                       }
+                       // Translate gender/points
+                       $content['gender'] = TRANSLATE_GENDER($content['gender']);
+                       $content['points'] = TRANSLATE_COMMA($content['points']);
 
                        // 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);
-
-               // Get current month
-               $curr = date("m", time());
-               if (strlen($curr) == 1) $curr = "0".$curr;
-               if ($curr == "00") $curr = "12";
+                       $msg = LOAD_EMAIL_TEMPLATE("member_beg", $content, bigintval($content['userid']));
+                       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__);
-       }
+       } // END - if
 
        // Free memory
        SQL_FREERESULT($result_main);
-}
+} // END - if
 
 //
 ?>