X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mailid_top.php;h=e4ef0a812e992c0c5163b8dd9acd1ab3d97b9614;hb=03cf8f5966d13bab1c193b16ecbdf62fa6fbcce4;hp=6b2ee7bc89faeb5bac20aa584966a987140d3e99;hpb=63f159414369b5ea19a8ca75d8cd8033c45d8341;p=mailer.git

diff --git a/mailid_top.php b/mailid_top.php
index 6b2ee7bc89..e4ef0a812e 100644
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -41,7 +41,7 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
-$GLOBALS['__start_time'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(TRUE);
 
 // Tell everyone we are in this module
 $GLOBALS['__module']      = 'mailid';
@@ -77,8 +77,7 @@ if (isGetRequestElementSet('bonusid')) $bonusId = bigintval(getRequestElement('b
 if (isGetRequestElementSet('code'))    $code    = bigintval(getRequestElement('code'));
 if (isGetRequestElementSet('do'))      $do      = getRequestElement('do');
 
-// 01             2       21    12           2    2            21    1                      2210
-if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalErrorsDetected())) {
+if ((isValidId($userId)) && ((isValidId($mailId)) || (isValidId($bonusId))) && (!ifFatalErrorsDetected())) {
 	// No image?
 	if ($do != 'img') {
 		// ... then output header
@@ -86,74 +85,78 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 	} // 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",
+	if (isValidId($mailId)) {
+		$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",
+	} elseif (isValidId($bonusId)) {
+		$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;
+		$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 `id` AS `pool_id`, `is_notify` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+					array($urlId), __FILE__, __LINE__);
 				break;
 
 			default: // Unknown type
-				reportBug(__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 (!in_array($notify, array('Y', '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'] = NULL;
 			} // END - if
 
 			// Is the user id valid?
-			if (fetchUserData($userId) === true) {
+			if (fetchUserData($userId) === TRUE) {
 				// Is the user status CONFIRMED?
 				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');
-								$isValid   = true;
+								list($paymentId) = SQL_FETCHROW($result);
+								$time      = getPaymentData($paymentId, 'time');
+								$payment   = getPaymentData($paymentId, 'payment');
+								$isValid   = TRUE;
 							} // END - if
 
 							// Free memory...
@@ -161,13 +164,13 @@ 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",
-								array(bigintval($pool)), __FILE__, __LINE__);
+							$result = SQL_QUERY_ESC("SELECT `time`, `points` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+								array(bigintval($data['pool_id'])), __FILE__, __LINE__);
 
 							// Entry found?
 							if (SQL_NUMROWS($result) == 1) {
 								list($time, $payment) = SQL_FETCHROW($result);
-								$isValid = true;
+								$isValid = TRUE;
 							} // END - if
 
 							// Free memory...
@@ -175,13 +178,16 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 							break;
 
 						default: // Unknown type
-							reportBug(__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) {
+					if ($isValid === TRUE) {
+						// Run at least one second
 						if (($time == '0') && ($payment > 0)) $time = 1;
+
+						// Is time and payment set?
 						if (($time > 0) && ($payment > 0)) {
 							$realCode = '0';
 							if (!empty($code)) {
@@ -197,7 +203,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__);
@@ -223,12 +229,12 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 											break;
 
 										default: // Unknown type
-											reportBug(__FILE__, __LINE__, 'Unknown mail type ' . $ltype . ' detected.');
+											reportBug(__FILE__, __LINE__, 'Unknown mail type ' . $data['link_type'] . ' detected.');
 											break;
 									} // END - switch
 
 									// Export data into constants for the template
-									$content['banner'] = loadTemplate('mailid_banner', true);
+									$content['banner'] = loadTemplate('mailid_banner', TRUE);
 
 									// Only when user extension = v0.1.2: Update mails-confirmed counter
 									// @TODO Rewrite these blocks to filter
@@ -273,9 +279,9 @@ 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)) {
+												if ((((getBonusUserid() == $userId) && (isBonusIncludeOwnEnabled())) || (getBonusUserid() != $userId)) && (getDefRefid() != $userId)) {
 													// Add points and remember ranking are done in this function....
 													addTurboBonus($urlId, $userId, $type);
 
@@ -302,28 +308,28 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 										$content['points'] = $payment;
 
 										// Load template
-										loadTemplate($template, false, $content);
-									} elseif (isValidUserId($sender)) {
+										loadTemplate($template, FALSE, $content);
+									} elseif (isValidId($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;
 
 										// Load template
-										loadTemplate('mailid_points_failed', false, $content);
+										loadTemplate('mailid_points_failed', FALSE, $content);
 									} else {
 										// Add payment points (again)
 										$content['points'] = $payment;
 
 										// Load template
-										loadTemplate('mailid_points_failed2', false, $content);
+										loadTemplate('mailid_points_failed2', FALSE, $content);
 									}
 
 									// 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 +343,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 										$content['userid'] = $userId;
 										$content['type']   = $type;
 										$content['data']   = $urlId;
-										$content['banner'] = loadTemplate('mailid_banner', true);
+										$content['banner'] = loadTemplate('mailid_banner', TRUE);
 										if (getCodeLength() > 0) {
 											// Generate Code
 											$content['image'] = generateCaptchaCode($code, $type, $urlId, $userId);
@@ -349,7 +355,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 										}
 
 										// Load template
-										loadTemplate($templ, false, $content);
+										loadTemplate($templ, FALSE, $content);
 									} else {
 										// Cannot confirm!
 										reportBug(__FILE__, __LINE__, 'No code given.');
@@ -364,11 +370,10 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 									$content['userid'] = $userId;
 									$content['type']   = $type;
 									$content['data']   = $urlId;
-									$content['rand']   = getRandomTan();
-									$content['banner'] = loadTemplate('mailid_banner', true);
+									$content['banner'] = loadTemplate('mailid_banner', TRUE);
 
 									// Load template
-									loadTemplate('mailid_timer', false, $content);
+									loadTemplate('mailid_timer', FALSE, $content);
 									break;
 
 								default: // Unknown mode
@@ -376,30 +381,30 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 									break;
 							} // END - switch
 						} else {
-							loadTemplate('admin_settings_unsaved', false, '{--MAIL_ALREADY_CONFIRMED--} (6)');
+							loadTemplate('admin_settings_unsaved', FALSE, '{--MAIL_ALREADY_CONFIRMED--} (6)');
 							$do = 'failed';
 						}
 					} else {
-						loadTemplate('admin_settings_unsaved', false, '{--MAIL_ALREADY_CONFIRMED--} (5)');
+						loadTemplate('admin_settings_unsaved', FALSE, '{--MAIL_ALREADY_CONFIRMED--} (5)');
 						$do = 'failed';
 					}
 				} else {
-					loadTemplate('admin_settings_unsaved', false, '{--MAIL_ALREADY_CONFIRMED--} (4)');
+					loadTemplate('admin_settings_unsaved', FALSE, '{--MAIL_ALREADY_CONFIRMED--} (4)');
 					$do = 'failed';
 				}
 			} else {
-				loadTemplate('admin_settings_unsaved', false, '{--MAIL_ALREADY_CONFIRMED--} (3)');
+				loadTemplate('admin_settings_unsaved', FALSE, '{--MAIL_ALREADY_CONFIRMED--} (3)');
 				$do = 'failed';
 			}
 		} else {
-			loadTemplate('admin_settings_unsaved', false, '{--MAIL_ALREADY_CONFIRMED--} (2)');
+			loadTemplate('admin_settings_unsaved', FALSE, '{--MAIL_ALREADY_CONFIRMED--} (2)');
 			$do = 'failed';
 		}
 
 		// Free result
 		SQL_FREERESULT($result_mailid);
 	} else {
-		loadTemplate('admin_settings_unsaved', false, '{--MAIL_ALREADY_CONFIRMED--} (1)');
+		loadTemplate('admin_settings_unsaved', FALSE, '{--MAIL_ALREADY_CONFIRMED--} (1)');
 		$do = 'failed';
 	}