More rewrites/fixes (not all is fixed) for ext-sponsor

[mailer.git] / doubler.php

diff --git a/doubler.php b/doubler.php
index 8685143cf2f2f935ab93a199e9f15c76424c3fe9..76e16485535833d1f4d84c2c9efecd18d1909414 100644 (file)
--- a/doubler.php
+++ b/doubler.php
@@ -67,7 +67,7 @@ if (isFormSent()) {
        setPostRequestParameter('points', bigintval(postRequestParameter('points')));
 
        // Begin with doubling process
-       if ((isPostRequestParameterSet('userid')) && (isPostRequestParameterSet('pass')) && (isPostRequestParameterSet('points'))) {
+       if ((isPostRequestParameterSet('userid')) && (isPostRequestParameterSet('password')) && (isPostRequestParameterSet('points'))) {
                // Probe for nickname extension and if a nickname was entered
                if (isNickNameUsed(postRequestParameter('userid'))) {
                        // Nickname in URL, so load the id
@@ -90,12 +90,12 @@ if (isFormSent()) {
                $probe_points = ((postRequestParameter('points') >= getConfig('doubler_min')) && (postRequestParameter('points') <= getConfig('doubler_max')));
 
                // Check all together
-               if ((isUserDataValid()) && (getUserData('password') == generateHash(postRequestParameter('pass'), substr(getUserData('password'), 0, -40))) && (getUserData('status') == 'CONFIRMED') && ($probe_points)) {
+               if ((isUserDataValid()) && (getUserData('password') == generateHash(postRequestParameter('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['doubler_userid'] = getUserData('userid');
+                       $GLOBALS['local_doubler_userid'] = getUserData('userid');
 
                        // Calulcate points
-                       $points = countSumTotalData(getUserData('userid'), 'user_points', 'points') - countSumTotalData(getUserData('userid'), 'user_data', 'used_points');
+                       $points = getTotalPoints(getUserData('userid'));
 
                        // So let's continue with probing his points amount
                        if (($points - getConfig('doubler_left') - postRequestParameter('points') * getConfig('doubler_charge') / 100) >= 0) {
@@ -162,7 +162,7 @@ if (isFormSent()) {
        } elseif (!isPostRequestParameterSet('userid')) {
                // Login not entered
                $content['message'] = '{--DOUBLER_FORM_404_LOGIN--}';
-       } elseif (!isPostRequestParameterSet('pass')) {
+       } elseif (!isPostRequestParameterSet('password')) {
                // Password not entered
                $content['message'] = '{--DOUBLER_FORM_404_PASSWORD--}';
        } elseif (!isPostRequestParameterSet('points')) {