X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mailid_top.php;h=40ef802d4167751fd426cb85f85f11aeae111050;hb=6449d733d65425128f9ebc3f9d9c818c6a7e5206;hp=d77d5eba4cee15ae5bf2519e40700a4452e0f3c7;hpb=c8d76610eb94093d4eed4fcd8a6cb72e74c8f6d8;p=mailer.git

diff --git a/mailid_top.php b/mailid_top.php
index d77d5eba4c..40ef802d41 100644
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -15,8 +15,10 @@
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
+ * @TODO Merge this script with mailid.php                              *
+ * -------------------------------------------------------------------- *
  * 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 *
@@ -48,8 +50,9 @@ $GLOBALS['output_mode'] = -1;
 // Load the required file(s)
 require('inc/config-global.php');
 
-// Set content type
+// Set content type and HTTP status
 setContentType('text/html');
+setHttpStatus('404 NOT FOUND');
 
 // Is the extension mailid active?
 redirectOnUninstalledExtension('mailid');
@@ -73,17 +76,20 @@ if (isGetRequestParameterSet('mode'))    $mode    = getRequestParameter('mode');
 
 // 01             2       21    12           2    2            21    1                      2210
 if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalErrorsDetected())) {
-	// No image? Then output header
-	if ($mode != 'img') loadIncludeOnce('inc/header.php');
+	// No image?
+	if ($mode != 'img') {
+		// ... then output header
+		loadIncludeOnce('inc/header.php');
+	} // END - fi
 
 	// 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;
@@ -99,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;
 
@@ -148,7 +154,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?
@@ -170,10 +176,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(getConfig('code_length'), $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
@@ -221,7 +227,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?
@@ -236,7 +242,10 @@ 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(postRequestParameter('gfx_check')) == $realCode) {
+										// Set HTTP status to okay
+										setHttpStatus('200 OK');
+
 										// Add points over referal system is the default
 										$template = 'mailid_points_done';
 
@@ -251,8 +260,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" ?
@@ -260,7 +268,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)) && (getConfig('def_refid') != $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);
 
@@ -281,7 +289,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;
@@ -290,10 +298,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
@@ -302,7 +320,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 									break;
 
 								case 'img':
-									generateImageOrCode($img_code);
+									generateImageOrCode($realCode);
 									break;
 
 								case 'confirm':
@@ -313,13 +331,13 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 										$content['type']   = $type;
 										$content['data']   = $urlId;
 										$content['banner'] = loadTemplate('mailid_banner', true);
-										if (getConfig('code_length') > 0) {
+										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';
 										}