More improved SQL queries

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

diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index 73d3a57f361958282af0dec7fbc7cc64079ab82c..17a38d2a8b69c10cdb168d03ffc86421271c92b9 100644 (file)
--- a/inc/monthly/monthly_beg.php
+++ b/inc/monthly/monthly_beg.php
@@ -40,32 +40,37 @@ if (!defined('__SECURITY')) {
 }
 
 // Do not execute when script is in CSS mode or no daily reset
-if (($CSS == 1) || (!defined('__DAILY_RESET')) || ($_CONFIG['beg_rallye'] == "N")) return;
+if (($CSS == 1) || (!defined('__DAILY_RESET')) || (getConfig('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 != getConfig('last_month')) && (getConfig('last_month') > 0) && (getConfig('beg_ranks') > 0) && ($CSS != 1)) {
        // Extension "autopurge" is inactive or purging of inactive accounts is deactivated
        $whereStatement1 = "";
-       $whereStatement2 = bigintval($_CONFIG['beg_ranks']);
+       $whereStatement2 = bigintval(getConfig('beg_ranks'));
+
+       // Shall we exclude webmaster's own userid?
+       if ((getConfig('beg_include_own') == "N") && (getConfig('beg_uid') > 0)) {
+               // Exclude it
+               $whereStatement1 = sprintf(" AND userid != %s", bigintval(getConfig('beg_uid')));
+       } // END - if
 
        // 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 (($_CONFIG['ap_inactive_since'] > 0) && ($_CONFIG['beg_active'] == "Y")) {
+               if ((getConfig('ap_inactive_since') > 0) && (getConfig('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']);
+                       $whereStatement1 .= sprintf(" AND last_online >= (UNIX_TIMESTAMP() - %s)", bigintval(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
+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__);
@@ -74,7 +79,7 @@ LIMIT %s",
                // Load our winners...
                while ($content = SQL_FETCHARRAY($result_main)) {
                        // Add points to user's account directly
-                       ADD_POINTS_REFSYSTEM($content['userid'], $content['points'], false, "0", false, "direct");
+                       ADD_POINTS_REFSYSTEM("monthly_beg", $content['userid'], $content['points'], false, "0", false, "direct");
 
                        // Translate gender/points
                        $content['gender'] = TRANSLATE_GENDER($content['gender']);
@@ -86,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