Removed 2nd parameter for assert() as this is only available in PHP 5.4.8+ but Mailer...

[mailer.git] / doubler.php

diff --git a/doubler.php b/doubler.php
index 04fb0d6a93596483fef630d8c6a0075c552dfda8..46f16f9122829361268eb60b0b08369c2629307e 100644 (file)
--- a/doubler.php
+++ b/doubler.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -76,7 +76,7 @@ if (isFormSent()) {
                }
 
                // Is the data valid?
-               if (!isUserDataValid()) {
+               if (!isValidUserData()) {
                        // Output message that the userid is not okay
                        displayMessage('{--DOUBLER_USERID_INVALID--}');
                } // END - if
@@ -88,7 +88,7 @@ if (isFormSent()) {
                $probe_points = ((postRequestElement('points') >= getDoublerMin()) && (postRequestElement('points') <= getDoublerMax()));
 
                // Check all together
-               if ((isUserDataValid()) && (getUserData('password') == generateHash(postRequestElement('password'), substr(getUserData('password'), 0, -40))) && (getUserData('status') == 'CONFIRMED') && ($probe_points)) {
+               if ((isValidUserData()) && (getUserData('password') == generateHash(postRequestElement('password'), substr(getUserData('password'), 0, -40))) && (getUserData('status') == 'CONFIRMED') && ($probe_points)) {
                        // Nickname resolved to a unique userid or direct userid entered by the member
                        $GLOBALS['local_doubler_userid'] = getUserData('userid');
 
@@ -99,12 +99,12 @@ if (isFormSent()) {
                        if (($points - getConfig('doubler_left') - postRequestElement('points') * getDoublerCharge() / 100) >= 0) {
                                // Enough points are left so let's continue with the doubling process
                                // Create doubling "account" with *DOUBLED* points
-                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_doubler` (`userid`, `refid`, `points`, `remote_ip`, `timemark`, `completed`, `is_ref`) VALUES (%s,%s,%s,'%s', UNIX_TIMESTAMP(), 'N','N')",
+                               sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_doubler` (`userid`, `refid`, `points`, `remote_ip`, `timemark`, `completed`, `is_ref`) VALUES (%s,%s,%s,'%s', UNIX_TIMESTAMP(), 'N','N')",
                                        array(
                                                getUserData('userid'),
                                                convertZeroToNull(determineReferralId()),
                                                bigintval(postRequestElement('points') * 2),
-                                               detectRemoteAddr()
+                                               determineRealRemoteAddress()
                                        ), __FILE__, __LINE__);
 
                                // Subtract entered points and ignore return status
@@ -118,11 +118,11 @@ if (isFormSent()) {
                                // Add second line for the referral but only when userid != refid
                                if ((isValidId(determineReferralId())) && (determineReferralId() != getUserData('userid'))) {
                                        // 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,'%s',UNIX_TIMESTAMP(),'N','Y')",
+                                       sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_doubler` (`userid`, `refid`, `points`, `remote_ip`, `timemark`, `completed`, `is_ref`) VALUES (%s,0,%s,'%s',UNIX_TIMESTAMP(),'N','Y')",
                                                array(
                                                        convertZeroToNull(determineReferralId()),
                                                        (postRequestElement('points') * 2 * getDoublerRef() / 100),
-                                                       detectRemoteAddr()
+                                                       determineRealRemoteAddress()
                                                ), __FILE__, __LINE__);
 
                                        // And that's why we don't want to you more than one referral level of doubler-points. ^^^
@@ -179,7 +179,7 @@ if (getDoublerSendMode() == 'DIRECT') {
 // Output header
 loadIncludeOnce('inc/header.php');
 
-if (isUserDataValid()) {
+if (isValidUserData()) {
        // Transfer userid/nickname to constant
        $content['refid'] = getUserData('userid');
 } else {