X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mailid_top.php;h=2f14d1ef1b44c18f2fd354bfd62b72dda23560a8;hb=7de3a32ac5c5cd7f92468fb91aa1aa5a61cf004d;hp=c1d913a03b320d4de8926f570e906edae7a8649d;hpb=c3b4eaf29946349ff058691db2dcb615a5379bb2;p=mailer.git

diff --git a/mailid_top.php b/mailid_top.php
index c1d913a03b..2f14d1ef1b 100644
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -15,9 +15,11 @@
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
+ * @TODO Merge this script with mailid.php                              *
+ * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -66,11 +68,11 @@ $code = '0';
 $mode = '';
 
 // Secure all data
-if (isGetRequestParameterSet('userid'))  $userId  = bigintval(getRequestParameter('userid'));
-if (isGetRequestParameterSet('mailid'))  $mailId  = bigintval(getRequestParameter('mailid'));
-if (isGetRequestParameterSet('bonusid')) $bonusId = bigintval(getRequestParameter('bonusid'));
-if (isGetRequestParameterSet('code'))    $code    = bigintval(getRequestParameter('code'));
-if (isGetRequestParameterSet('mode'))    $mode    = getRequestParameter('mode');
+if (isGetRequestElementSet('userid'))  $userId  = bigintval(getRequestElement('userid'));
+if (isGetRequestElementSet('mailid'))  $mailId  = bigintval(getRequestElement('mailid'));
+if (isGetRequestElementSet('bonusid')) $bonusId = bigintval(getRequestElement('bonusid'));
+if (isGetRequestElementSet('code'))    $code    = bigintval(getRequestElement('code'));
+if (isGetRequestElementSet('mode'))    $mode    = getRequestElement('mode');
 
 // 01             2       21    12           2    2            21    1                      2210
 if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalErrorsDetected())) {
@@ -82,12 +84,12 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 
 	// Maybe he wants to confirm an email?
 	if ($mailId > 0) {
-		$result_main = SQL_QUERY_ESC("SELECT `id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s AND `userid`=%s LIMIT 1",
+		$result_main = SQL_QUERY_ESC("SELECT `id`,`link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s AND `userid`=%s LIMIT 1",
 			array($mailId, $userId), __FILE__, __LINE__);
 		$type = 'mailid';
 		$urlId = $mailId;
 	} elseif ($bonusId > 0) {
-		$result_main = SQL_QUERY_ESC("SELECT `id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s AND `userid`=%s LIMIT 1",
+		$result_main = SQL_QUERY_ESC("SELECT `id`,`link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s AND `userid`=%s LIMIT 1",
 			array($bonusId, $userId), __FILE__, __LINE__);
 		$type = 'bonusid';
 		$urlId = $bonusId;
@@ -103,12 +105,12 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 		// @TODO Rewrite this to a filter
 		switch ($ltype) {
 			case 'NORMAL':
-				$result_mailid = SQL_QUERY_ESC("SELECT `pool_id`, `userid`, `id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
+				$result_mailid = SQL_QUERY_ESC("SELECT `pool_id`,`userid`,`id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
 					array($mailId), __FILE__, __LINE__);
 				break;
 
 			case 'BONUS':
-				$result_mailid = SQL_QUERY_ESC("SELECT `id`, `id`, `is_notify` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+				$result_mailid = SQL_QUERY_ESC("SELECT `id`,`id`,`is_notify` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
 					array($bonusId), __FILE__, __LINE__);
 				break;
 
@@ -123,10 +125,14 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 			list($pool, $sender, $notify) = SQL_FETCHROW($result_mailid);
 
 			// Correct notification switch in non-bonus mails
-			if (($notify != 'Y') && ($notify != 'N')) $notify = 'N';
+			if (($notify != 'Y') && ($notify != 'N')) {
+				$notify = 'N';
+			} // END - if
 
 			// Set sender to 0 when we have a bonus mail
-			if ($ltype == 'BONUS') $sender = '0';
+			if ($ltype == 'BONUS') {
+				$sender = '0';
+			} // END - if
 
 			// Is the user id valid?
 			if (fetchUserData($userId) === true) {
@@ -152,7 +158,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 							break;
 
 						case 'BONUS':
-							$result = SQL_QUERY_ESC("SELECT `time`, `points` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+							$result = SQL_QUERY_ESC("SELECT `time`,`points` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
 								array(bigintval($pool)), __FILE__, __LINE__);
 
 							// Entry found?
@@ -174,10 +180,10 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 					if ($isValid === true) {
 						if (($time == '0') && ($payment > 0)) $time = 1;
 						if (($time > 0) && ($payment > 0)) {
-							$img_code = '0';
+							$realCode = '0';
 							if (!empty($code)) {
-								// Generate code
-								$img_code = generateRandomCode(getCodeLength(), $code, $userId, $urlId);
+								// Generate code (the user sees in the CAPTCHA)
+								$realCode = generateRandomCode(getCodeLength(), $code, $userId, $urlId);
 							} // END - if
 
 							// @TODO Rewrite this to a filter
@@ -225,7 +231,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 									// @TODO Rewrite these blocks to filter
 									if (isExtensionInstalledAndNewer('user', '0.1.2')) {
 										// Update counter
-										SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET mails_confirmed=mails_confirmed + 1 WHERE `userid`=%s LIMIT 1",
+										SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `mails_confirmed`=`mails_confirmed`+1 WHERE `userid`=%s LIMIT 1",
 											array($userId), __FILE__, __LINE__);
 
 										// Update random confirmed as well?
@@ -240,7 +246,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 									insertUserStatsRecord($userId, $type, $stats_data);
 
 									// Right code entered?
-									if (bigintval(postRequestParameter('gfx_check')) == $img_code) {
+									if (bigintval(postRequestElement('gfx_check')) == $realCode) {
 										// Set HTTP status to okay
 										setHttpStatus('200 OK');
 
@@ -258,8 +264,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 											array($userId), __FILE__, __LINE__);
 
 										// Add points
-										// @TODO Try to rewrite the following unset()
-										unset($GLOBALS['ref_level']);
+										initReferalSystem();
 										addPointsThroughReferalSystem('mailid_okay', $userId, $payment);
 
 										// Shall I add bonus points for "turbo clickers" ?
@@ -267,7 +272,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 											// Is an active-rallye running and this is not a notification mail?
 											if ((isBonusRallyeActive()) && ($notify != 'Y')) {
 												// Shall I exclude the webmaster's own userid from the active-rallye?
-												if ((((getBonusUserId() == $userId) && (getConfig('bonus_include_own') == 'Y')) || (getBonusUserId() != $userId)) && (getDefRefid() != $userId)) {
+												if ((((getBonusUserid() == $userId) && (getConfig('bonus_include_own') == 'Y')) || (getBonusUserid() != $userId)) && (getDefRefid() != $userId)) {
 													// Add points and remember ranking are done in this function....
 													addTurboBonus($urlId, $userId, $type);
 
@@ -288,7 +293,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 										} // END - if
 
 										// Load total points
-										$content['total']  = getTotalPoints($userId);
+										$content['total_points']  = getTotalPoints($userId);
 
 										// Add payment points
 										$content['points'] = $payment;
@@ -297,10 +302,20 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 										loadTemplate($template, false, $content);
 									} elseif (isValidUserId($sender)) {
 										// Wrong image code! So add points to sender's account
-										addPointsDirectly('mailid_payback', $sender, $payment);
+										initReferalSystem();
+										addPointsThroughReferalSystem('mailid_payback', $sender, $payment);
+
+										// Add payment points
+										$content['points'] = $payment;
 
 										// Load template
 										loadTemplate('mailid_points_failed', false, $content);
+									} else {
+										// Add payment points (again)
+										$content['points'] = $payment;
+
+										// Load template
+										loadTemplate('mailid_points_failed2', false, $content);
 									}
 
 									// Remove link from table
@@ -309,7 +324,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 									break;
 
 								case 'img':
-									generateImageOrCode($img_code);
+									generateImageOrCode($realCode);
 									break;
 
 								case 'confirm':
@@ -322,11 +337,11 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 										$content['banner'] = loadTemplate('mailid_banner', true);
 										if (getCodeLength() > 0) {
 											// Generate Code
-											$content['image'] = generateCaptchaCode($code, $type, $urlId, $userId);
+											$content['image'] = generateCaptchaCode($realCode, $type, $urlId, $userId);
 											$templ = 'mailid_enter_code';
 										} else {
 											// Disabled code
-											$content['gfx'] = $img_code;
+											$content['gfx'] = $realCode;
 											$templ = 'mailid_confirm_buttom';
 										}