X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=doubler.php;h=579a4afb4f605d0ed19d090d2d1a35a66e2c7b69;hp=f8acd23ae928e9d163cb4c2452e1b912e34b9cd5;hb=bb902775e3ba4ef820a764fc5f3c725a8f03e45c;hpb=f2aeaab0cd313b2eeb151642455ed558f6b186dc

diff --git a/doubler.php b/doubler.php
index f8acd23ae9..579a4afb4f 100644
--- a/doubler.php
+++ b/doubler.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -67,7 +65,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,19 +88,23 @@ 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) {
 				// 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 +115,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__);
 
@@ -158,7 +160,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')) {