More misc fixes and rewrites (sorry, lame description)

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

diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index adc07ca534af20436289f3738cf009e5a5314690..3d5396e36c804b6ca6cd993f3edee6d1af911ad3 100644 (file)
--- a/inc/monthly/monthly_beg.php
+++ b/inc/monthly/monthly_beg.php
@@ -45,58 +45,60 @@ if (!defined('__SECURITY')) {
 }
 
 // Do not execute when script is in CSS mode or no daily reset
-if (($GLOBALS['output_mode'] == 1) || (!isResetModeEnabled()) || (getConfig('beg_rallye') != 'Y')) return;
+if ((getOutputMode() == 1) || (!isResetModeEnabled()) || (getConfig('beg_rallye') != 'Y')) return;
 //* DEBUG: */ echo basename(__FILE__)."<br />\n";
 
 // Get current month (2 digits)
-$curr = date("m", time());
+$curr = date('m', time());
 
 // Check if month is done
-if (($curr != getConfig('last_month')) && (getConfig('last_month') > 0) && (getConfig('beg_ranks') > 0) && ($GLOBALS['output_mode'] != 1)) {
+if (($curr != getConfig('last_month')) && (getConfig('last_month') > 0) && (getConfig('beg_ranks') > 0) && (getOutputMode() != 1)) {
        // Extension 'autopurge' is inactive or purging of inactive accounts is deactivated
        $whereStatement1 = '';
-       $whereStatement2 = getConfig(('beg_ranks'));
 
        // Shall we exclude webmaster's own userid?
        if ((getConfig('beg_include_own') != 'Y') && (getConfig('beg_uid') > 0)) {
                // Exclude it
-               $whereStatement1 = sprintf(" AND userid != %s", getConfig(('beg_uid')));
+               $whereStatement1 = sprintf(" AND `userid` != %s", getConfig('beg_uid'));
        } // END - if
 
-       // Let's check if there are some points left we can "pay"...
+       // Let's check if there are some points left we can 'pay'...
        if (EXT_IS_ACTIVE('autopurge')) {
                // Use last online stamp only when autopurge for inactive members is activated
                if ((getConfig('ap_inactive_since') > 0) && (getConfig('beg_active') == 'Y')) {
                        // Okay, include last online timestamp
-                       $whereStatement1 .= sprintf(" AND last_online >= (UNIX_TIMESTAMP() - %s)", getConfig(('ap_inactive_since')));;
+                       $whereStatement1 .= sprintf(" AND `last_online` >= (UNIX_TIMESTAMP() - %s)", getConfig('ap_inactive_since'));
                } // END - if
        } // END - if
 
        // SQL string to check for accounts
-       $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
+       $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` ASC
 LIMIT %s",
-               array($whereStatement2), __FILE__, __LINE__);
+               array(getConfig('beg_ranks')), __FILE__, __LINE__);
 
        if (SQL_NUMROWS($result_main) > 0) {
                // Load our winners...
                while ($content = SQL_FETCHARRAY($result_main)) {
                        // Add points to user's account directly
-                       ADD_POINTS_REFSYSTEM("monthly_beg", $content['userid'], $content['points'], false, "0", false, "direct");
+                       ADD_POINTS_REFSYSTEM_DIRECT('monthly_beg', $content['userid'], $content['points']);
 
                        // Translate gender/points
-                       $content['gender'] = TRANSLATE_GENDER($content['gender']);
-                       $content['points'] = TRANSLATE_COMMA($content['points']);
+                       $content['gender'] = translateGender($content['gender']);
+                       $content['points'] = translateComma($content['points']);
 
                        // Load email template and email it away
-                       $msg = LOAD_EMAIL_TEMPLATE("member_beg", $content, bigintval($content['userid']));
-                       SEND_EMAIL($content['email'], BEG_MONTHLY_RALLYE, $msg);
+                       $message = LOAD_EMAIL_TEMPLATE('member_beg', $content, bigintval($content['userid']));
+                       sendEmail($content['email'], getMessage('BEG_MONTHLY_RALLYE'), $message);
                } // END - while
 
                // Reset accounts
-               $result = SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET beg_points=0.00000 WHERE beg_points > 0", __FILE__, __LINE__);
+               $result = SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `beg_points`=0.00000 WHERE `beg_points` > 0", __FILE__, __LINE__);
        } // END - if
 
        // Free memory