More misc fixes and rewrites (sorry, lame description)

[mailer.git] / doubler.php

diff --git a/doubler.php b/doubler.php
index a521ad470903a35cc3c474e34223036fdf5d376f..03a2e5872a946c1f5e2ea0bd1b8b9c3447f78d81 100644 (file)
--- a/doubler.php
+++ b/doubler.php
@@ -60,22 +60,19 @@ if (!isInstalled()) {
 } // END - if
 
 // Probe for referal ID
-if (REQUEST_ISSET_GET(('refid'))) $GLOBALS['refid'] = REQUEST_GET(('refid'));
+if (REQUEST_ISSET_GET('refid')) $GLOBALS['refid'] = REQUEST_GET('refid');
 
 // Only check this if refid is provided!
 if ($GLOBALS['refid'] > 0) {
-       // Probe for nickname extension and if a nickname was supplied by URL
-       $probe_nickname = ((EXT_IS_ACTIVE('nickname')) && ((''.round($GLOBALS['refid']).'') != $GLOBALS['refid']));
-
        // Do we have nickname or userid set?
-       if ($probe_nickname === true) {
+       if (isNicknameUsed($GLOBALS['refid'])) {
                // Nickname in URL, so load the ID
-               $result = SQL_QUERY_ESC("SELECT userid, status FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nickname='%s' LIMIT 1",
-               array(bigintval($GLOBALS['refid'])), __FILE__, __LINE__);
+               $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",
-               array(bigintval($GLOBALS['refid'])), __FILE__, __LINE__);
+               $result = SQL_QUERY_ESC("SELECT userid, status FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1",
+                       array(bigintval($GLOBALS['refid'])), __FILE__, __LINE__);
        }
 
        // Load data
@@ -101,17 +98,16 @@ if (isFormSent()) {
        REQUEST_SET_POST('points', bigintval(REQUEST_POST('points')));
 
        // Begin with doubling process
-       if ((REQUEST_ISSET_POST(('userid'))) && (REQUEST_ISSET_POST(('pass'))) && (REQUEST_ISSET_POST(('points')))) {
+       if ((REQUEST_ISSET_POST('userid')) && (REQUEST_ISSET_POST('pass')) && (REQUEST_ISSET_POST('points'))) {
                // Probe for nickname extension and if a nickname was entered
-               $probe_nickname = ((EXT_IS_ACTIVE('nickname')) && ((''.round(REQUEST_POST('userid')).'') != REQUEST_POST('userid')));
-               if ($probe_nickname) {
+               if (isNickNameUsed(REQUEST_POST('userid'))) {
                        // 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",
-                       array(REQUEST_POST('userid')), __FILE__, __LINE__);
+                       $result = SQL_QUERY_ESC("SELECT `userid`, `status`, `password` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `nickname`='%s' LIMIT 1",
+                               array(REQUEST_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",
-                       array(bigintval(REQUEST_POST('userid'))), __FILE__, __LINE__);
+                       $result = SQL_QUERY_ESC("SELECT `userid`, `status, `password` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1",
+                               array(bigintval(REQUEST_POST('userid'))), __FILE__, __LINE__);
                }
 
                // Load data
@@ -139,8 +135,8 @@ if (isFormSent()) {
                        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','".detectRemoteAddr()."', UNIX_TIMESTAMP(), 'N','N')",
-                               array($uid, bigintval($GLOBALS['refid']), bigintval(REQUEST_POST('points') * 2)), __FILE__, __LINE__);
+                               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
                                SUB_POINTS('doubler', $uid, REQUEST_POST('points'));
@@ -153,11 +149,11 @@ if (isFormSent()) {
                                // 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','".detectRemoteAddr()."',UNIX_TIMESTAMP(),'N','Y')",
-                                       array(
-                                               bigintval($GLOBALS['refid']),
-                                               bigintval(REQUEST_POST('points') * 2 * getConfig('doubler_ref'))
-                                       ), __FILE__, __LINE__);
+                                       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'))
+                                               ), __FILE__, __LINE__);
 
                                        // And that's why we don't want to you more than one referal level of doubler-points. ^^^
                                } // END - if
@@ -186,20 +182,20 @@ if (isFormSent()) {
                } elseif (REQUEST_POST('points') > getConfig('doubler_max')) {
                        // Too much points entered
                        define('__ERROR_MSG', getMessage('DOUBLER_FORM_POINTS_MAX'));
-               } elseif ($probe_nickname) {
+               } elseif (isNickNameUsed(REQUEST_POST('userid'))) {
                        // Cannot resolv nickname -> userid
                        define('__ERROR_MSG', getMessage('DOUBLER_FORM_404_NICKNAME'));
                } else {
                        // Wrong password or account not found
                        define('__ERROR_MSG', getMessage('DOUBLER_FORM_404_MEMBER'));
                }
-       } elseif (!REQUEST_ISSET_POST(('userid'))) {
+       } elseif (!REQUEST_ISSET_POST('userid')) {
                // Login not entered
                define('__ERROR_MSG', getMessage('DOUBLER_FORM_404_LOGIN'));
-       } elseif (!REQUEST_ISSET_POST(('pass'))) {
+       } elseif (!REQUEST_ISSET_POST('pass')) {
                // Password not entered
                define('__ERROR_MSG', getMessage('DOUBLER_FORM_404_PASSWORD'));
-       } elseif (!REQUEST_ISSET_POST(('points'))) {
+       } elseif (!REQUEST_ISSET_POST('points')) {
                // points not entered
                define('__ERROR_MSG', getMessage('DOUBLER_FORM_404_POINTS'));
        }