X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=mailid_top.php;h=ca8c3a57410b1e6f8d3039c303d6ee0d7b890861;hp=04aef4c0fddccc49b610aaa88dcf2073874d4504;hb=8fad776382e63b3f73f8dbe289f229d79cfc2c22;hpb=0bf269e4e23914d73991dda245948d651ab2c2d9

diff --git a/mailid_top.php b/mailid_top.php
index 04aef4c0fd..ca8c3a5741 100644
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -18,7 +18,7 @@
  * @TODO Merge this script with mailid.php                              *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -41,18 +41,21 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
-$GLOBALS['startTime'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(true);
 
 // Tell everyone we are in this module
-$GLOBALS['__module'] = 'mailid';
-$GLOBALS['output_mode'] = '0';
+$GLOBALS['__module']      = 'mailid';
+$GLOBALS['__output_mode'] = '0';
+
+// Disable copyright footer which would be to large for the upper frame
+$GLOBALS['__copyright_enabled'] = 'N';
 
 // Load the required file(s)
 require('inc/config-global.php');
 
 // Set content type and HTTP status
 setContentType('text/html');
-setHttpStatus('404 NOT FOUND');
+setHttpStatus('404 Not Found');
 
 // Is the extension mailid active?
 redirectOnUninstalledExtension('mailid');
@@ -84,54 +87,58 @@ 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` AS `link_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` AS `link_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;
+	} else {
+		// Not detected
+		reportBug(__FILE__, __LINE__, 'Whether bonusid or mailid was set. This is a strange bug.');
 	}
 
+	// Is an entry found?
 	if (SQL_NUMROWS($result_main) == 1) {
 		// Is the stats id valid?
-		list($lid, $ltype) = SQL_FETCHROW($result_main);
+		$data = SQL_FETCHARRAY($result_main);
 
 		// Init result here with invalid to avoid possible missing variable
 		$result_mailid = false;
 
-		// @TODO Rewrite this to a filter
-		switch ($ltype) {
+		// @TODO Rewrite this to a filter/function
+		switch ($data['link_type']) {
 			case 'NORMAL':
-				$result_mailid = SQL_QUERY_ESC("SELECT `pool_id`,`userid`,`id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
-					array($mailId), __FILE__, __LINE__);
+				$result_mailid = SQL_QUERY_ESC("SELECT `pool_id`, `userid` AS `sender` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
+					array($urlId), __FILE__, __LINE__);
 				break;
 
 			case 'BONUS':
-				$result_mailid = SQL_QUERY_ESC("SELECT `id`,`id`,`is_notify` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
-					array($bonusId), __FILE__, __LINE__);
+				$result_mailid = SQL_QUERY_ESC("SELECT `is_notify` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+					array($urlId), __FILE__, __LINE__);
 				break;
 
 			default: // Unknown type
-				debug_report_bug(__FILE__, __LINE__, 'Unknown mail type ' . $ltype . ' detected.');
+				reportBug(__FILE__, __LINE__, 'Unknown mail type ' . $data['link_type'] . ' detected.');
 				break;
-		}
+		} // END - switch
 
 		// Entry found?
 		if (SQL_NUMROWS($result_mailid) == 1) {
 			// Load data
-			list($pool, $sender, $notify) = SQL_FETCHROW($result_mailid);
+			$data = merge_array($data, SQL_FETCHARRAY($result_mailid));
 
 			// Correct notification switch in non-bonus mails
-			if (($notify != 'Y') && ($notify != 'N')) {
-				$notify = 'N';
+			if ((!isset($data['is_notify'])) || (!in_array($data['is_notify'], array('Y', 'N')))) {
+				$data['is_notify'] = 'N';
 			} // END - if
 
 			// Set sender to 0 when we have a bonus mail
-			if ($ltype == 'BONUS') {
-				$sender = '0';
+			if ($data['link_type'] == 'BONUS') {
+				$data['sender'] = '0';
 			} // END - if
 
 			// Is the user id valid?
@@ -140,16 +147,16 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 				if (getUserData('status') == 'CONFIRMED') {
 					// User has confirmed his account so we can procede...
 					// @TODO Rewrite this to a filter
-					switch ($ltype) {
+					switch ($data['link_type']) {
 						case 'NORMAL':
 							$result = SQL_QUERY_ESC("SELECT `payment_id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s LIMIT 1",
-								array(bigintval($pool)), __FILE__, __LINE__);
+								array(bigintval($data['pool_id'])), __FILE__, __LINE__);
 
 							// Entry found?
 							if (SQL_NUMROWS($result) == 1) {
 								list($pay) = SQL_FETCHROW($result);
-								$time      = getPaymentPoints($pay, 'time');
-								$payment   = getPaymentPoints($pay, 'payment');
+								$time      = getPaymentData($pay, 'time');
+								$payment   = getPaymentData($pay, 'payment');
 								$isValid   = true;
 							} // END - if
 
@@ -159,7 +166,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 
 						case 'BONUS':
 							$result = SQL_QUERY_ESC("SELECT `time`,`points` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
-								array(bigintval($pool)), __FILE__, __LINE__);
+								array(bigintval($data['pool_id'])), __FILE__, __LINE__);
 
 							// Entry found?
 							if (SQL_NUMROWS($result) == 1) {
@@ -172,9 +179,9 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 							break;
 
 						default: // Unknown type
-							debug_report_bug(__FILE__, __LINE__, 'Unknown mail type ' . $ltype . ' detected.');
+							reportBug(__FILE__, __LINE__, 'Unknown mail type ' . $data['link_type'] . ' detected.');
 							break;
-					}
+					} // END - switch
 
 					// Is this entry valid?
 					if ($isValid === true) {
@@ -194,7 +201,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 
 									// Count clicks
 									// @TODO Rewrite this to a filter
-									switch ($ltype) {
+									switch ($data['link_type']) {
 										case 'NORMAL':
 											SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_stats` SET `clicks`=`clicks`+1 WHERE `id`=%s LIMIT 1",
 												array($mailId), __FILE__, __LINE__);
@@ -220,7 +227,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 											break;
 
 										default: // Unknown type
-											debug_report_bug(__FILE__, __LINE__, 'Unknown mail type ' . $ltype . ' detected.');
+											reportBug(__FILE__, __LINE__, 'Unknown mail type ' . $data['link_type'] . ' detected.');
 											break;
 									} // END - switch
 
@@ -270,7 +277,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 										// Shall I add bonus points for "turbo clickers" ?
 										if (isExtensionInstalledAndNewer('bonus', '0.2.2')) {
 											// Is an active-rallye running and this is not a notification mail?
-											if ((isBonusRallyeActive()) && ($notify != 'Y')) {
+											if ((isBonusRallyeActive()) && ($data['is_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)) {
 													// Add points and remember ranking are done in this function....
@@ -300,10 +307,10 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 
 										// Load template
 										loadTemplate($template, false, $content);
-									} elseif (isValidUserId($sender)) {
+									} elseif (isValidUserId($data['sender'])) {
 										// Wrong image code! So add points to sender's account
 										initReferralSystem();
-										addPointsThroughReferralSystem('mailid_payback', $sender, $payment);
+										addPointsThroughReferralSystem('mailid_payback', $data['sender'], $payment);
 
 										// Add payment points
 										$content['points'] = $payment;
@@ -320,7 +327,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 
 									// Remove link from table
 									SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `id`=%s LIMIT 1",
-										array(bigintval($lid)), __FILE__, __LINE__);
+										array(bigintval($data['link_id'])), __FILE__, __LINE__);
 									break;
 
 								case 'img':
@@ -337,7 +344,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 										$content['banner'] = loadTemplate('mailid_banner', true);
 										if (getCodeLength() > 0) {
 											// Generate Code
-											$content['image'] = generateCaptchaCode($realCode, $type, $urlId, $userId);
+											$content['image'] = generateCaptchaCode($code, $type, $urlId, $userId);
 											$templ = 'mailid_enter_code';
 										} else {
 											// Disabled code
@@ -349,7 +356,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 										loadTemplate($templ, false, $content);
 									} else {
 										// Cannot confirm!
-										debug_report_bug(__FILE__, __LINE__, 'No code given.');
+										reportBug(__FILE__, __LINE__, 'No code given.');
 									}
 									break;
 
@@ -361,7 +368,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 									$content['userid'] = $userId;
 									$content['type']   = $type;
 									$content['data']   = $urlId;
-									$content['rand']   = mt_rand(0, 99999);
+									$content['rand']   = getRandomTan();
 									$content['banner'] = loadTemplate('mailid_banner', true);
 
 									// Load template
@@ -369,7 +376,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 									break;
 
 								default: // Unknown mode
-									debug_report_bug(__FILE__, __LINE__, 'Unknown mode ' . $do . ' detected.');
+									reportBug(__FILE__, __LINE__, 'Unknown mode ' . $do . ' detected.');
 									break;
 							} // END - switch
 						} else {
@@ -411,7 +418,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 }
 
 // Really all done here... ;-)
-shutdown();
+doShutdown();
 
 // [EOF]
 ?>