X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=mailid.php;h=97f943890e53dc2699f34a4b03a805d07015891e;hp=c30f0f41fd98587ab4a3cd3bea998dbf241668ba;hb=ec5bcdd7331073503aff5742884785b2fdd498e3;hpb=c8b873767ffb97349c8a9f5b114cadbc2b747574

diff --git a/mailid.php b/mailid.php
index c30f0f41fd..97f943890e 100644
--- a/mailid.php
+++ b/mailid.php
@@ -49,11 +49,8 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 	// Is the extension active
 	if (!EXT_IS_ACTIVE("mailid", true)) {
 		// Is not activated/installed yet!
-		ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "mailid"));
-	}
-
-	// Add header
-	require_once(PATH."inc/header.php");
+		LOAD_URL("modules.php?module=index&msg=".CODE_EXTENSION_PROBLEM);
+	} // END - if
 
 	// Init
 	$url_uid = 0; $url_bid = 0; $url_mid = 0;
@@ -70,12 +67,12 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 		// 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=%d AND userid=%d LIMIT 1",
+			$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"; $DATA = $url_mid;
 		} elseif ($url_bid > 0) {
 			// Bonus-Mail
-			$result = SQL_QUERY_ESC("SELECT link_type FROM "._MYSQL_PREFIX."_user_links WHERE bonus_id=%d AND userid=%d LIMIT 1",
+			$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"; $DATA = $url_bid;
 		} else {
@@ -89,38 +86,45 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 
 			// Clean result
 			SQL_FREERESULT($result);
+
 			switch ($ltype)
 			{
 			case "NORMAL":
 				// Is the stats ID valid?
-				$result = SQL_QUERY_ESC("SELECT pool_id, url FROM "._MYSQL_PREFIX."_user_stats WHERE id=%d LIMIT 1",
+				$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;
 
 			case "BONUS":
+				// Is the bonus extension active?
+				if (!EXT_IS_ACTIVE("bonus")) {
+					// Abort here
+					LOAD_URL("modules.php?module=index&msg=".CODE_EXTENSION_PROBLEM);
+				} // END - if
+
 				// Bonus-Mails
-				$result = SQL_QUERY_ESC("SELECT id, url FROM "._MYSQL_PREFIX."_bonus WHERE id=%d LIMIT 1",
+				$result = SQL_QUERY_ESC("SELECT id, url, subject FROM "._MYSQL_PREFIX."_bonus WHERE id=%s LIMIT 1",
 				 array($url_bid), __FILE__, __LINE__);
 				break;
 			}
 
 			if (SQL_NUMROWS($result) == 1) {
 				// Load data
-				list($pool, $URL) = SQL_FETCHROW($result);
+				list($pool, $URL, $EXTRA_TITLE) = SQL_FETCHROW($result);
 				SQL_FREERESULT($result);
 
 				// Is the user's ID unlocked?
-				$result = SQL_QUERY_ESC("SELECT status, sex, surname, family FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d LIMIT 1",
+				$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, $sex, $sname, $fname) = SQL_FETCHROW($result);
+					list($status, $gender, $sname, $fname) = SQL_FETCHROW($result);
 					SQL_FREERESULT($result);
 					if ($status == "CONFIRMED") {
 						// User has confirmed his account so we can procede...
 						switch ($ltype)
 						{
 						case "NORMAL":
-							$result = SQL_QUERY_ESC("SELECT payment_id FROM "._MYSQL_PREFIX."_user_stats WHERE pool_id=%d LIMIT 1",
+							$result = SQL_QUERY_ESC("SELECT payment_id FROM "._MYSQL_PREFIX."_user_stats WHERE pool_id=%s LIMIT 1",
 							 array(bigintval($pool)), __FILE__, __LINE__);
 							if (SQL_NUMROWS($result) == 1)
 							{
@@ -135,7 +139,7 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 							break;
 
 						case "BONUS":
-							$result = SQL_QUERY_ESC("SELECT points, time FROM "._MYSQL_PREFIX."_bonus WHERE id=%d LIMIT 1",
+							$result = SQL_QUERY_ESC("SELECT points, time FROM "._MYSQL_PREFIX."_bonus WHERE id=%s LIMIT 1",
 							 array($url_bid), __FILE__, __LINE__);
 							if (SQL_NUMROWS($result) == 1)
 							{
@@ -149,6 +153,9 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 							break;
 						}
 
+						// Add header
+						require_once(PATH."inc/header.php");
+
 						// Was that mail a valid one?
 						if ($VALID) {
 							// If time is zero seconds we have a sponsor mail. 1 Second shall be set to avoid problems
@@ -209,10 +216,5 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 	LOAD_URL("install.php");
 }
 
-// Shutdown database link
-if (is_resource($link)) {
-	SQL_CLOSE($link, __FILE__, __LINE__);
-}
-
 //
 ?>