Major fixes in filters/extensions, other improvements:

[mailer.git] / doubler.php

diff --git a/doubler.php b/doubler.php
index 4bbc6581b02d46f7d2319a8834136b641185606e..34c7c7380cba253ff4d136a053006bf235ab1e98 100644 (file)
--- a/doubler.php
+++ b/doubler.php
@@ -63,11 +63,11 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
        $probe_nickname = ((EXT_IS_ACTIVE("nickname")) && (("".round($GLOBALS['refid'])."") != $GLOBALS['refid']));
        if ($probe_nickname) {
                // Nickname in URL, so load the ID
-               $result = SQL_QUERY_ESC("SELECT userid, status FROM "._MYSQL_PREFIX."_user_data WHERE nickname='%s' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT userid, status FROM `"._MYSQL_PREFIX."_user_data` WHERE nickname='%s' LIMIT 1",
                 array(bigintval($GLOBALS['refid'])), __FILE__, __LINE__);
        } else {
                // Direct userid entered
-               $result = SQL_QUERY_ESC("SELECT userid, status FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT userid, status FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
                 array(bigintval($GLOBALS['refid'])), __FILE__, __LINE__);
        }
 
@@ -81,7 +81,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
 
        // If no account was found set default refid and status to CONFIRMED
        if (empty($GLOBALS['refid'])) {
-               $GLOBALS['refid'] = $_CONFIG['def_refid'];
+               $GLOBALS['refid'] = getConfig('def_refid');
                $status = "CONFIRMED";
        } // END - if
 
@@ -96,11 +96,11 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                        $probe_nickname = ((EXT_IS_ACTIVE("nickname")) && (("".round($_POST['userid'])."") != $_POST['userid']));
                        if ($probe_nickname) {
                                // Nickname in URL, so load the ID
-                               $result = SQL_QUERY_ESC("SELECT userid, status, password FROM "._MYSQL_PREFIX."_user_data WHERE nickname='%s' LIMIT 1",
+                               $result = SQL_QUERY_ESC("SELECT userid, status, password FROM `"._MYSQL_PREFIX."_user_data` WHERE nickname='%s' LIMIT 1",
                                 array($_POST['userid']), __FILE__, __LINE__);
                        } else {
                                // Direct userid entered
-                               $result = SQL_QUERY_ESC("SELECT userid, status, password FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
+                               $result = SQL_QUERY_ESC("SELECT userid, status, password FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
                                 array(bigintval($_POST['userid'])), __FILE__, __LINE__);
                        }
 
@@ -115,7 +115,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                        $_POST['points'] = bigintval(round(REVERT_COMMA($_POST['points'])));
 
                        // Probe for enough points
-                       $probe_points = (($_POST['points'] >= $_CONFIG['doubler_min']) && ($_POST['points'] <= $_CONFIG['doubler_max']));
+                       $probe_points = (($_POST['points'] >= getConfig('doubler_min')) && ($_POST['points'] <= getConfig('doubler_max')));
 
                        // Check all together
                        if ((!empty($uid)) && ($password == generateHash($_POST['pass'], substr($password, 0, -40))) && ($status == "CONFIRMED") && ($probe_points)) {
@@ -126,7 +126,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                $points = GET_TOTAL_DATA($uid, "user_points", "points") - GET_TOTAL_DATA($uid, "user_data", "used_points");
 
                                // So let's continue with probing his points amount
-                               if (($points - $_CONFIG['doubler_left'] - $_POST['points'] * $_CONFIG['doubler_charge']) >= 0)
+                               if (($points - getConfig('doubler_left') - $_POST['points'] * getConfig('doubler_charge')) >= 0)
                                {
                                        // Enough points are left so let's continue with the doubling process
                                        // Create doubling "account" width *DOUBLED* points
@@ -137,15 +137,15 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                        SUB_POINTS("doubler", $uid, $_POST['points']);
 
                                        // Add points to "total payed" including charge
-                                       $points = $_POST['points'] - $_POST['points'] * $_CONFIG['doubler_charge'];
+                                       $points = $_POST['points'] - $_POST['points'] * getConfig('doubler_charge');
                                        UPDATE_CONFIG("doubler_points", $points, "+");
-                                       $_CONFIG['doubler_points'] += $points;
+                                       getConfig('doubler_points') += $points;
 
                                        // Add second line for the referal but only when uid != refid
                                        if (($GLOBALS['refid'] > 0) && ($GLOBALS['refid'] != $uid)) {
                                                // Okay add a refid line and apply refid percents
                                                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_doubler (userid,refid,points,remote_ip,timemark,completed,is_ref) VALUES ('%s',0,'%s','".GET_REMOTE_ADDR()."',UNIX_TIMESTAMP(),'N','Y')",
-                                                       array(bigintval($GLOBALS['refid']), bigintval($_POST['points'] * 2 * $_CONFIG['doubler_ref'])), __FILE__, __LINE__);
+                                                       array(bigintval($GLOBALS['refid']), bigintval($_POST['points'] * 2 * getConfig('doubler_ref'))), __FILE__, __LINE__);
 
                                                // And that's why we dont't want to you more than one referal level of doubler-points. ^^^
                                        } // END - if
@@ -169,10 +169,10 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                        } elseif ($status == "LOCKED") {
                                // Account is locked by admin / holiday!
                                define('__ERROR_MSG', DOUBLER_FORM_STATUS_LOCKED);
-                       } elseif ($_POST['points'] < $_CONFIG['doubler_min']) {
+                       } elseif ($_POST['points'] < getConfig('doubler_min')) {
                                // Not enougth points entered
                                define('__ERROR_MSG', DOUBLER_FORM_POINTS_MIN);
-                       } elseif ($_POST['points'] > $_CONFIG['doubler_max']) {
+                       } elseif ($_POST['points'] > getConfig('doubler_max')) {
                                // Too much points entered
                                define('__ERROR_MSG', DOUBLER_FORM_POINTS_MAX);
                        } elseif ($probe_nickname) {
@@ -199,7 +199,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
        if (!defined('__ERROR_MSG'))   define('__ERROR_MSG'  , "");
 
        // Shall I check for points immediately?
-       if ($_CONFIG['doubler_send_mode'] == "DIRECT") require(PATH."inc/doubler_send.php");
+       if (getConfig('doubler_send_mode') == "DIRECT") require(PATH."inc/doubler_send.php");
 
        // Output header
        include(PATH."inc/header.php");
@@ -220,11 +220,11 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
        }
 
        // Percent values etc.
-       define('__CHARGE_VALUE', TRANSLATE_COMMA($_CONFIG['doubler_charge'] * 100));
-       define('__REF_VALUE'   , TRANSLATE_COMMA($_CONFIG['doubler_ref'] * 100));
-       define('__TOTAL_VALUE' , TRANSLATE_COMMA($_CONFIG['doubler_points']));
-       define('__MIN_VALUE'   , TRANSLATE_COMMA($_CONFIG['doubler_min']));
-       define('__MAX_VALUE'   , TRANSLATE_COMMA($_CONFIG['doubler_max']));
+       define('__CHARGE_VALUE', TRANSLATE_COMMA(getConfig('doubler_charge') * 100));
+       define('__REF_VALUE'   , TRANSLATE_COMMA(getConfig('doubler_ref') * 100));
+       define('__TOTAL_VALUE' , TRANSLATE_COMMA(getConfig('doubler_points')));
+       define('__MIN_VALUE'   , TRANSLATE_COMMA(getConfig('doubler_min')));
+       define('__MAX_VALUE'   , TRANSLATE_COMMA(getConfig('doubler_max')));
 
        // Text "Enter login"
        if (EXT_IS_ACTIVE("nickname")) {
@@ -236,7 +236,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
        }
 
        // Which mail-send-mode did the admin setup?
-       switch ($_CONFIG['doubler_send_mode'])
+       switch (getConfig('doubler_send_mode'))
        {
        case "DIRECT":
                define('DOUBLER_PAYOUT_TIME', DOUBLER_PAYOUT_TIME_DIRECT);
@@ -251,10 +251,10 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
        define('__DOUBLER_PAYOUT_HISTORY', DOUBLER_GENERATE_TABLE("0", "Y", "N", "DESC"));
 
        // Generate timemark
-       define('__TIMEOUT_MARK', CREATE_FANCY_TIME($_CONFIG['doubler_timeout']));
+       define('__TIMEOUT_MARK', CREATE_FANCY_TIME(getConfig('doubler_timeout')));
 
        // Usage counter
-       define('__DOUBLER_COUNTER', $_CONFIG['doubler_counter']);
+       define('__DOUBLER_COUNTER', getConfig('doubler_counter'));
 
        // Points left to doubler
        define('__LEFT_VALUE', TRANSLATE_COMMA(DOUBLER_GET_TOTAL_POINTS_LEFT()));