X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=mailid.php;h=68dfb1cfe185b99d1253754212d7d11c2ea4bd86;hp=dcd0208ad0247cb47df77dee388cbd3e6d08ace6;hb=7c15ca79161bf475e958810a5b585bce869a2af9;hpb=3925d2168d4740ced8ea4e510a525ed4743c8f4f

diff --git a/mailid.php b/mailid.php
index dcd0208ad0..68dfb1cfe1 100644
--- a/mailid.php
+++ b/mailid.php
@@ -83,21 +83,18 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
 			array($url_bid, $url_userid), __FILE__, __LINE__);
 		$type = 'bonusid'; $urlId = $url_bid;
 	} else {
-		// Problem: No ID entered
+		// Problem: No id entered
 		redirectToUrl('index.php');
 	}
 
 	if (SQL_NUMROWS($result_link) == 1) {
 		// Load the entry
-		list($ltype) = SQL_FETCHROW($result);
-
-		// Clean result
-		SQL_FREERESULT($result);
+		list($ltype) = SQL_FETCHROW($result_link);
 
 		// @TODO Rewrite this to a filter
 		switch ($ltype) {
 			case 'NORMAL':
-				// Is the stats ID valid?
+				// Is the stats id valid?
 				$result = SQL_QUERY_ESC("SELECT pool_id, url, subject FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
 					array($url_mid), __FILE__, __LINE__);
 				break;
@@ -126,13 +123,10 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
 			// Set it
 			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_userid), __FILE__, __LINE__);
-			if (SQL_NUMROWS($result) == 1) {
-				list($status, $gender, $surname, $family) = SQL_FETCHROW($result);
-				SQL_FREERESULT($result);
-				if ($status == 'CONFIRMED') {
+			// Is the user's id unlocked?
+			if (fetchUserData($url_userid)) {
+				// Status must be CONFIRMED
+				if (getUserData('status') == 'CONFIRMED') {
 					// User has confirmed his account so we can procede...
 					// @TODO Rewrite this to a filter
 					switch ($ltype) {
@@ -193,20 +187,20 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
 						$errorCode = getCode('POSSIBLE_INVALID');
 					}
 				} else {
-					$errorCode = getCode('ACCOUNT_' . $status);
+					$errorCode = getCode('ACCOUNT_' . getUserData('status'));
 				}
 			} else {
-				SQL_FREERESULT($result);
 				$errorCode = getCode('USER_404');
 			}
 		} else {
-			SQL_FREERESULT($result);
 			$errorCode = getCode('STATS_404');
 		}
 	} else {
-		SQL_FREERESULT($result);
 		$errorCode = getCode('ALREADY_CONFIRMED');
 	}
+
+	// Free result
+	SQL_FREERESULT($result_link);
 } else {
 	// Nothing entered
 	$errorCode = getCode('ERROR_MAILID');