More rewrites to make use of (cached) wrapper functions

[mailer.git] / doubler.php

diff --git a/doubler.php b/doubler.php
index f53908359aed0d12042f3c2785818fd2c7d0e691..8685143cf2f2f935ab93a199e9f15c76424c3fe9 100644 (file)
--- a/doubler.php
+++ b/doubler.php
@@ -102,7 +102,11 @@ if (isFormSent()) {
                                // 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(getUserData('userid'), determineReferalId(), bigintval(postRequestParameter('points') * 2)), __FILE__, __LINE__);
+                                       array(
+                                               getUserData('userid'),
+                                               makeDatabaseUserId(determineReferalId()),
+                                               bigintval(postRequestParameter('points') * 2)
+                                       ), __FILE__, __LINE__);
 
                                // Subtract entered points
                                subtractPoints('doubler', getUserData('userid'), postRequestParameter('points'));
@@ -113,11 +117,11 @@ if (isFormSent()) {
                                incrementConfigEntry('doubler_points', $points);
 
                                // Add second line for the referal but only when userid != refid
-                               if ((determineReferalId() > 0) && (determineReferalId() != getUserData('userid'))) {
+                               if ((isValidUserId(determineReferalId())) && (determineReferalId() != 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','".detectRemoteAddr()."',UNIX_TIMESTAMP(),'N','Y')",
                                                array(
-                                                       determineReferalId(),
+                                                       makeDatabaseUserId(determineReferalId()),
                                                        bigintval(postRequestParameter('points') * 2 * getConfig('doubler_ref') / 100)
                                                ), __FILE__, __LINE__);
 
@@ -131,39 +135,39 @@ if (isFormSent()) {
                                $content['message'] = loadTemplate('doubler_reflink', true, postRequestParameter('userid'));
                        } else {
                                // Not enougth points left
-                               $content['message'] = getMessage('DOUBLER_FORM_NO_POINTS_LEFT');
+                               $content['message'] = '{--DOUBLER_FORM_NO_POINTS_LEFT--}';
                        }
                } elseif (getUserData('status') == 'CONFIRMED') {
                        // Account is unconfirmed!
-                       $content['message'] = getMessage('DOUBLER_FORM_WRONG_PASS');
+                       $content['message'] = '{--DOUBLER_FORM_WRONG_PASS--}';
                } elseif (getUserData('status') == 'UNCONFIRMED') {
                        // Account is unconfirmed!
-                       $content['message'] = getMessage('DOUBLER_FORM_STATUS_UNCONFIRMED');
+                       $content['message'] = '{--DOUBLER_FORM_STATUS_UNCONFIRMED--}';
                } elseif (getUserData('status') == 'LOCKED') {
                        // Account is locked by admin / holiday!
-                       $content['message'] = getMessage('DOUBLER_FORM_STATUS_LOCKED');
+                       $content['message'] = '{--DOUBLER_FORM_STATUS_LOCKED--}';
                } elseif (postRequestParameter('points') < getConfig('doubler_min')) {
                        // Not enougth points entered
-                       $content['message'] = getMessage('DOUBLER_FORM_POINTS_MIN');
+                       $content['message'] = '{--DOUBLER_FORM_POINTS_MIN--}';
                } elseif (postRequestParameter('points') > getConfig('doubler_max')) {
                        // Too much points entered
-                       $content['message'] = getMessage('DOUBLER_FORM_POINTS_MAX');
+                       $content['message'] = '{--DOUBLER_FORM_POINTS_MAX--}';
                } elseif (isNickNameUsed(postRequestParameter('userid'))) {
                        // Cannot resolv nickname -> userid
-                       $content['message'] = getMessage('DOUBLER_FORM_404_NICKNAME');
+                       $content['message'] = '{--DOUBLER_FORM_404_NICKNAME--}';
                } else {
                        // Wrong password or account not found
-                       $content['message'] = getMessage('DOUBLER_FORM_404_MEMBER');
+                       $content['message'] = '{--DOUBLER_FORM_404_MEMBER--}';
                }
        } elseif (!isPostRequestParameterSet('userid')) {
                // Login not entered
-               $content['message'] = getMessage('DOUBLER_FORM_404_LOGIN');
+               $content['message'] = '{--DOUBLER_FORM_404_LOGIN--}';
        } elseif (!isPostRequestParameterSet('pass')) {
                // Password not entered
-               $content['message'] = getMessage('DOUBLER_FORM_404_PASSWORD');
+               $content['message'] = '{--DOUBLER_FORM_404_PASSWORD--}';
        } elseif (!isPostRequestParameterSet('points')) {
                // points not entered
-               $content['message'] = getMessage('DOUBLER_FORM_404_POINTS');
+               $content['message'] = '{--DOUBLER_FORM_404_POINTS--}';
        }
 } // END - if (isFormSet())
 
@@ -191,14 +195,14 @@ if (isUserDataValid()) {
 // Text "Enter login"
 if (isExtensionActive('nickname')) {
        // Choose login/nickname
-       $content['enter_login'] = getMessage('GUEST_ENTER_LOGIN_NICKNAME');
+       $content['enter_login'] = '{--GUEST_ENTER_LOGIN_NICKNAME--}';
 } else {
        // Simple login id
-       $content['enter_login'] = getMessage('GUEST_ENTER_LOGIN');
+       $content['enter_login'] = '{--GUEST_ENTER_LOGIN--}';
 }
 
 // Which mail-send-mode did the admin setup?
-$content['payout_time'] = getMessage('DOUBLER_PAYOUT_TIME_' . getConfig('doubler_send_mode'));
+$content['payout_time'] = '{--DOUBLER_PAYOUT_TIME_' . getConfig('doubler_send_mode') . '--}';
 
 // Generate table with already payed out doubles
 $content['payout_history'] = generateDoublerTable(0, 'Y', 'N', 'DESC');