New naming convention applied to many functions, see #118 for details

[mailer.git] / doubler.php

diff --git a/doubler.php b/doubler.php
index 189925ac4c8dcbadcdc2bd3afcb710d65e743083..04f02e81777df69a4703cffebe204c52cdca11d1 100644 (file)
--- a/doubler.php
+++ b/doubler.php
@@ -120,7 +120,7 @@ if (isInstalled()) {
                        SQL_FREERESULT($result);
 
                        // Remove any dots and unwanted chars from the points
-                       REQUEST_SET_POST('points', bigintval(round(REVERT_COMMA(REQUEST_POST('points')))));
+                       REQUEST_SET_POST('points', bigintval(round(convertCommaToDot(REQUEST_POST('points')))));
 
                        // Probe for enough points
                        $probe_points = ((REQUEST_POST('points') >= getConfig('doubler_min')) && (REQUEST_POST('points') <= getConfig('doubler_max')));
@@ -137,7 +137,7 @@ if (isInstalled()) {
                                if (($points - getConfig('doubler_left') - REQUEST_POST('points') * getConfig('doubler_charge')) >= 0) 
                                        // Enough points are left so let's continue with the doubling process
                                        // Create doubling "account" width *DOUBLED* points
-                                       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_doubler` (userid, refid, points, remote_ip, timemark, completed, is_ref) VALUES ('%s','%s','%s','".GET_REMOTE_ADDR()."', UNIX_TIMESTAMP(), 'N','N')",
+                                       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_doubler` (userid, refid, points, remote_ip, timemark, completed, is_ref) VALUES ('%s','%s','%s','".detectRemoteAddr()."', UNIX_TIMESTAMP(), 'N','N')",
                                                array($uid, bigintval($GLOBALS['refid']), bigintval(REQUEST_POST('points') * 2)), __FILE__, __LINE__);
 
                                        // Subtract entered points
@@ -145,13 +145,13 @@ if (isInstalled()) {
 
                                        // Add points to "total payed" including charge
                                        $points = REQUEST_POST('points') - REQUEST_POST('points') * getConfig('doubler_charge');
-                                       UPDATE_CONFIG('doubler_points', $points, '+');
+                                       updateConfiguration('doubler_points', $points, '+');
                                        incrementConfigEntry('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
-                                               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')",
+                                               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_doubler` (userid, refid, points, remote_ip, timemark, completed, is_ref) VALUES ('%s',0,'%s','".detectRemoteAddr()."',UNIX_TIMESTAMP(),'N','Y')",
                                                        array(
                                                                bigintval($GLOBALS['refid']),
                                                                bigintval(REQUEST_POST('points') * 2 * getConfig('doubler_ref'))
@@ -161,7 +161,7 @@ if (isInstalled()) {
                                        } // END - if
 
                                        // Update usage counter
-                                       UPDATE_CONFIG('doubler_counter', 1, '+');
+                                       updateConfiguration('doubler_counter', 1, '+');
 
                                        // Set constant
                                        define('__DOUBLER_MSG', LOAD_TEMPLATE('doubler_reflink', true, REQUEST_POST('userid')));
@@ -208,10 +208,10 @@ if (isInstalled()) {
        if (!defined('__ERROR_MSG'))   define('__ERROR_MSG'  , '');
 
        // Shall I check for points immediately?
-       if (getConfig('doubler_send_mode') == 'DIRECT') LOAD_INC('inc/doubler_send.php');
+       if (getConfig('doubler_send_mode') == 'DIRECT') loadInclude('inc/doubler_send.php');
 
        // Output header
-       LOAD_INC('inc/header.php');
+       loadInclude('inc/header.php');
 
        // Banner in text
        define('__DOUBLER_BANNER', LOAD_TEMPLATE('doubler_banner', true));
@@ -229,11 +229,11 @@ if (isInstalled()) {
        }
 
        // Percent values etc.
-       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')));
+       define('__CHARGE_VALUE', translateComma(getConfig('doubler_charge') * 100));
+       define('__REF_VALUE'   , translateComma(getConfig('doubler_ref') * 100));
+       define('__TOTAL_VALUE' , translateComma(getConfig('doubler_points')));
+       define('__MIN_VALUE'   , translateComma(getConfig('doubler_min')));
+       define('__MAX_VALUE'   , translateComma(getConfig('doubler_max')));
 
        // Text "Enter login"
        if (EXT_IS_ACTIVE('nickname')) {
@@ -260,22 +260,22 @@ if (isInstalled()) {
        define('__DOUBLER_PAYOUT_HISTORY', DOUBLER_GENERATE_TABLE('0', 'Y', 'N', 'DESC'));
 
        // Generate timemark
-       define('__TIMEOUT_MARK', CREATE_FANCY_TIME(getConfig('doubler_timeout')));
+       define('__TIMEOUT_MARK', createFancyTime(getConfig('doubler_timeout')));
 
        // Usage counter
        define('__DOUBLER_COUNTER', getConfig('doubler_counter'));
 
        // Points left to doubler
-       define('__LEFT_VALUE', TRANSLATE_COMMA(DOUBLER_GET_TOTAL_POINTS_LEFT()));
+       define('__LEFT_VALUE', translateComma(DOUBLER_GET_TOTAL_POINTS_LEFT()));
 
        // Output neccessary form for this
        LOAD_TEMPLATE('doubler_index');
 
        // Output footer
-       LOAD_INC('inc/footer.php');
+       loadInclude('inc/footer.php');
 } else {
        // You have to install first!
-       LOAD_URL('install.php');
+       redirectToUrl('install.php');
 }
 
 // Really all done here... ;-)