X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=doubler.php;h=403009eb184a3b140e8a02000a1ec06889a40f2d;hp=8685143cf2f2f935ab93a199e9f15c76424c3fe9;hb=f7d1229840cdae4ba22fdf375265bca4fb4a2d32;hpb=30ae22f62ae87c53a56baf0d134569ba91011111

diff --git a/doubler.php b/doubler.php
index 8685143cf2..403009eb18 100644
--- a/doubler.php
+++ b/doubler.php
@@ -14,11 +14,9 @@
  * $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                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -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
@@ -80,7 +78,7 @@ if (isFormSent()) {
 		// Is the data valid?
 		if (!isUserDataValid()) {
 			// Output message that the userid is not okay
-			loadTemplate('admin_settings_saved', false, '{--DOUBLER_USERID_INVALID--}');
+			displayMessage('{--DOUBLER_USERID_INVALID--}');
 		} // END - if
 
 		// Remove any dots and unwanted chars from the points
@@ -90,12 +88,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 +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')) {