Rewritten (does this fix the nested error?)

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

diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index c11b477238a04065d7510df981283424824be59e..f73fab7f71dca342914d4c3b03a2ba4d09ab5726 100644 (file)
--- a/inc/monthly/monthly_beg.php
+++ b/inc/monthly/monthly_beg.php
@@ -40,20 +40,20 @@ if (!defined('__SECURITY')) {
 }
 
 // Do not execute when script is in CSS mode or no daily reset
-if (($CSS == 1) || (!defined('__DAILY_RESET')) || (getConfig('beg_rallye') == "N")) return;
+if (($GLOBALS['output_mode'] == 1) || (!defined('__DAILY_RESET')) || (getConfig('beg_rallye') != "Y")) return;
 //* DEBUG: */ echo basename(__FILE__)."<br />\n";
 
 // Get current month (2 digits)
 $curr = date("m", time());
 
 // Check if month is done
-if (($curr != getConfig('last_month')) && (getConfig('last_month') > 0) && (getConfig('beg_ranks') > 0) && ($CSS != 1)) {
+if (($curr != getConfig('last_month')) && (getConfig('last_month') > 0) && (getConfig('beg_ranks') > 0) && ($GLOBALS['output_mode'] != 1)) {
        // Extension "autopurge" is inactive or purging of inactive accounts is deactivated
        $whereStatement1 = "";
        $whereStatement2 = bigintval(getConfig('beg_ranks'));
 
        // Shall we exclude webmaster's own userid?
-       if ((getConfig('beg_include_own') == "N") && (getConfig('beg_uid') > 0)) {
+       if ((getConfig('beg_include_own') != "Y") && (getConfig('beg_uid') > 0)) {
                // Exclude it
                $whereStatement1 = sprintf(" AND userid != %s", bigintval(getConfig('beg_uid')));
        } // END - if
@@ -69,8 +69,8 @@ if (($curr != getConfig('last_month')) && (getConfig('last_month') > 0) && (getC
 
        // 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
+FROM `{!_MYSQL_PREFIX!}_user_data`
+WHERE `status`='CONFIRMED'".$whereStatement1." AND beg_points > 0
 ORDER BY beg_points DESC, userid
 LIMIT %s",
                array($whereStatement2), __FILE__, __LINE__);
@@ -91,7 +91,7 @@ LIMIT %s",
                } // 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