X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mailid_top.php;h=214a1252183d504e195d463052e1bdb90110b3ef;hb=558e3a9d99bde2d7ad0a7e2ea7930dee5163d4d9;hp=ca8c3a57410b1e6f8d3039c303d6ee0d7b890861;hpb=7610d8baf42c19171389680fdefe5cd02e8ccda2;p=mailer.git

diff --git a/mailid_top.php b/mailid_top.php
index ca8c3a5741..214a125218 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';
@@ -107,7 +107,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 		$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/function
 		switch ($data['link_type']) {
@@ -117,7 +117,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 				break;
 
 			case 'BONUS':
-				$result_mailid = SQL_QUERY_ESC("SELECT `is_notify` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+				$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;
 
@@ -138,11 +138,11 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 
 			// Set sender to 0 when we have a bonus mail
 			if ($data['link_type'] == 'BONUS') {
-				$data['sender'] = '0';
+				$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...
@@ -154,10 +154,10 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 
 							// Entry found?
 							if (SQL_NUMROWS($result) == 1) {
-								list($pay) = SQL_FETCHROW($result);
-								$time      = getPaymentData($pay, 'time');
-								$payment   = getPaymentData($pay, 'payment');
-								$isValid   = true;
+								list($paymentId) = SQL_FETCHROW($result);
+								$time      = getPaymentData($paymentId, 'time');
+								$payment   = getPaymentData($paymentId, 'payment');
+								$isValid   = TRUE;
 							} // END - if
 
 							// Free memory...
@@ -165,13 +165,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",
+							$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...
@@ -184,8 +184,11 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 					} // 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)) {
@@ -232,7 +235,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 									} // 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
@@ -306,7 +309,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 										$content['points'] = $payment;
 
 										// Load template
-										loadTemplate($template, false, $content);
+										loadTemplate($template, FALSE, $content);
 									} elseif (isValidUserId($data['sender'])) {
 										// Wrong image code! So add points to sender's account
 										initReferralSystem();
@@ -316,13 +319,13 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 										$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
@@ -341,7 +344,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);
@@ -353,7 +356,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.');
@@ -369,10 +372,10 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 									$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
@@ -380,30 +383,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';
 	}