X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=mailid.php;h=dfc023c0554aa816cc4a5a4fb3b2121f859048e8;hp=58b41d6b753ae75a14c756354e94259b67a4bc34;hb=66b91ce490ab549425619c95fc12086e126d541b;hpb=2ec9007220186d54f84846871ed1f7638c29baf7

diff --git a/mailid.php b/mailid.php
index 58b41d6b75..dfc023c055 100644
--- a/mailid.php
+++ b/mailid.php
@@ -45,6 +45,7 @@ $GLOBALS['startTime'] = microtime(true);
 // Tell everyone we are in this module
 $GLOBALS['module'] = 'mailid';
 $GLOBALS['output_mode'] = -1;
+$errorCode = '';
 
 // Load the required file(s)
 require('inc/config-global.php');
@@ -72,13 +73,13 @@ if (($url_uid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors
 	// Maybe he wants to confirm an email?
 	if ($url_mid > 0) {
 		// Normal-Mails
-		$result = SQL_QUERY_ESC("SELECT link_type FROM `{!_MYSQL_PREFIX!}_user_links` WHERE stats_id=%s AND `userid`=%s LIMIT 1",
-		array($url_mid, $url_uid), __FILE__, __LINE__);
+		$result = SQL_QUERY_ESC("SELECT `link_type` FROM `{!_MYSQL_PREFIX!}_user_links` WHERE `stats_id`=%s AND `userid`=%s LIMIT 1",
+			array($url_mid, $url_uid), __FILE__, __LINE__);
 		$type = 'mailid'; $urlId = $url_mid;
 	} elseif ($url_bid > 0) {
 		// Bonus-Mail
-		$result = SQL_QUERY_ESC("SELECT link_type FROM `{!_MYSQL_PREFIX!}_user_links` WHERE bonus_id=%s AND `userid`=%s LIMIT 1",
-		array($url_bid, $url_uid), __FILE__, __LINE__);
+		$result = SQL_QUERY_ESC("SELECT `link_type` FROM `{!_MYSQL_PREFIX!}_user_links` WHERE `bonus_id`=%s AND `userid`=%s LIMIT 1",
+			array($url_bid, $url_uid), __FILE__, __LINE__);
 		$type = 'bonusid'; $urlId = $url_bid;
 	} else {
 		// Problem: No ID entered
@@ -129,8 +130,8 @@ if (($url_uid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors
 			setExtraTitle($title);
 
 			// Is the user's ID unlocked?
-			$result = SQL_QUERY_ESC("SELECT status, gender, surname, family FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-			array($url_uid), __FILE__, __LINE__);
+			$result = SQL_QUERY_ESC("SELECT `status`, `gender`, `surname`,` family` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1",
+				array($url_uid), __FILE__, __LINE__);
 			if (SQL_NUMROWS($result) == 1) {
 				list($status, $gender, $sname, $fname) = SQL_FETCHROW($result);
 				SQL_FREERESULT($result);
@@ -147,7 +148,7 @@ if (($url_uid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors
 								$time      = getPaymentPoints($pay, 'time');
 								$payment   = getPaymentPoints($pay, 'payment');
 								$isValid   = true;
-							}
+							} // END - if
 
 							// Free memory
 							SQL_FREERESULT($result);
@@ -155,7 +156,7 @@ if (($url_uid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors
 
 						case 'BONUS':
 							$result = SQL_QUERY_ESC("SELECT points, time FROM `{!_MYSQL_PREFIX!}_bonus` WHERE `id`=%s LIMIT 1",
-							array($url_bid), __FILE__, __LINE__);
+								array($url_bid), __FILE__, __LINE__);
 							if (SQL_NUMROWS($result) == 1) {
 								list($points, $time) = SQL_FETCHROW($result);
 								$payment = '0.00000';
@@ -177,50 +178,50 @@ if (($url_uid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors
 					// Was that mail a valid one?
 					if ($isValid === true) {
 						// If time is zero seconds we have a sponsor mail. 1 Second shall be set to avoid problems
-						if (($time == '0') && ($payment > 0)) { $URL = constant('URL'); $time = '1'; }
+						if (($time == '0') && ($payment > 0)) { $URL = getConfig('URL'); $time = '1'; }
 						if (($time > 0) && (($payment > 0) || ($points > 0))) {
-							// He can confirm this mail!
 							// Export data into constants for the template
-							// @TODO Rewrite these constants
-							define('_UID_VALUE' , $url_uid);
-							define('_TYPE_VALUE', $type);
-							define('_DATA_VALUE', $urlId);
-							define('_URL_VALUE' , DEREFERER($URL));
+							$content = array(
+								'uid'  => $url_uid,
+								'type' => $type,
+								'data' => $urlId,
+								'url'  => DEREFERER($URL)
+							);
 
 							// Load template
 							LOAD_TEMPLATE('mailid_frames');
 						} else {
-							$msg = getCode('DATA_INVALID');
+							$errorCode = getCode('DATA_INVALID');
 						}
 					} else {
-						$msg = getCode('POSSIBLE_INVALID');
+						$errorCode = getCode('POSSIBLE_INVALID');
 					}
 				} else {
-					$msg = getCode('ACCOUNT_LOCKED');
+					$errorCode = getCode('ACCOUNT_LOCKED');
 				}
 			} else {
 				SQL_FREERESULT($result);
-				$msg = getCode('USER_404');
+				$errorCode = getCode('USER_404');
 			}
 		} else {
 			SQL_FREERESULT($result);
-			$msg = getCode('STATS_404');
+			$errorCode = getCode('STATS_404');
 		}
 	} else {
 		SQL_FREERESULT($result);
-		$msg = getCode('ALREADY_CONFIRMED');
+		$errorCode = getCode('ALREADY_CONFIRMED');
 	}
 } else {
 	// Nothing entered
-	$msg = getCode('ERROR_MAILID');
+	$errorCode = getCode('ERROR_MAILID');
 }
 
 // Error code is set?
-if (!empty($msg)) {
+if (!empty($errorCode)) {
 	// @TODO Rewrite this to a filter
 	switch (getConfig('mailid_error_redirect')) {
 		case 'INDEX': // Redirect to index page
-			redirectToUrl('modules.php?module=index&msg='.$msg.'&ext=mailid');
+			redirectToUrl('modules.php?module=index&msg=' . $errorCode . '&ext=mailid');
 			break;
 
 		case 'REJECT': // Redirect to rejection page