X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=mailid.php;h=523d319c1969087c59416f97595aa4eb39b04a2b;hp=3c851cab1d80c2c5e3d9e00fec31adda3da0a7d7;hb=a17a898cb487fbc80e580d0b7e51f92327f2ea21;hpb=60494e212a67fe360bfbb481eb4928480a6f379b

diff --git a/mailid.php b/mailid.php
index 3c851cab1d..523d319c19 100644
--- a/mailid.php
+++ b/mailid.php
@@ -42,18 +42,14 @@ $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
 $GLOBALS['module'] = "mailid"; $CSS = -1;
 
 // Load the required file(s)
-require ("inc/config.php");
+require("inc/config.php");
 
-if (defined('mxchange_installed') && (mxchange_installed))
-{
+if (isBooleanConstantAndTrue('mxchange_installed')) {
 	// 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."&ext=mailid");
+	} // END - if
 
 	// Init
 	$url_uid = 0; $url_bid = 0; $url_mid = 0;
@@ -66,70 +62,73 @@ if (defined('mxchange_installed') && (mxchange_installed))
 	//* DEBUG: */ die("*".$url_uid."/".$url_bid."/".$url_mid."*<pre>".print_r($FATAL, true)."</pre>");
 
 	// 01        1        12            3    32           21    1     2      2     10
-	if (($url_uid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (count($FATAL) == 0))
-	{
+	if (($url_uid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (count($FATAL) == 0)) {
 		// Maybe he wants to confirm an email?
-		if ($url_mid > 0)
-		{
+		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)
-		{
+		} 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
-		{
+		} else {
 			// Problem: No ID entered
 			LOAD_URL("index.php");
 		}
-		if (SQL_NUMROWS($result) == 1)
-		{
+
+		if (SQL_NUMROWS($result) == 1) {
 			// Load the entry
 			list($ltype) = SQL_FETCHROW($result);
 
 			// 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&amp;msg=".CODE_EXTENSION_PROBLEM."&amp;ext=mailid");
+				} // 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)
-			{
+			if (SQL_NUMROWS($result) == 1) {
 				// Load data
-				list($pool, $URL) = SQL_FETCHROW($result);
+				list($pool, $URL, $EXTRA_TITLE) = SQL_FETCHROW($result);
+
+				// Free result
 				SQL_FREERESULT($result);
 
+				// Compile extra title
+				$EXTRA_TITLE = COMPILE_CODE($EXTRA_TITLE);
+
 				// 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);
+				if (SQL_NUMROWS($result) == 1) {
+					list($status, $gender, $sname, $fname) = SQL_FETCHROW($result);
 					SQL_FREERESULT($result);
-					if ($status == "CONFIRMED")
-					{
+					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)
 							{
@@ -144,7 +143,7 @@ if (defined('mxchange_installed') && (mxchange_installed))
 							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)
 							{
@@ -158,8 +157,11 @@ if (defined('mxchange_installed') && (mxchange_installed))
 							break;
 						}
 
-						if ($VALID)
-						{
+						// 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
 							if (($time == "0") && ($payment > 0)) { $URL = URL; $time = "1"; }
 							if (($time > 0) && (($payment > 0) || ($points > 0))) {
@@ -200,18 +202,28 @@ if (defined('mxchange_installed') && (mxchange_installed))
 
 	// Error code is set?
 	if (!empty($msg)) {
-		LOAD_URL("modules.php?module=index&msg=".$msg);
-	}
+		switch (getConfig('mailid_error_redirect')) {
+			case "INDEX": // Redirect to index page
+				LOAD_URL("modules.php?module=index&amp;msg=".$msg."&amp;ext=mailid");
+				break;
 
-	require_once(PATH."inc/footer.php");
-}
- else
-{
+			case "REJECT": // Redirect to rejection page
+				LOAD_URL(getConfig('reject_url'));
+				break;
+
+			default:
+				DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown status %s detected in mailid_error_redirect.", getConfig('mailid_error_redirect')));
+				LOAD_URL("modules.php?module=index&amp;msg=".CODE_UNKNOWN_STATUS."&amp;ext=mailid");
+				break;
+		}
+	} else {
+		// Include footer
+		require_once(PATH."inc/footer.php");
+	}
+} else {
 	// You have to configure first!
 	LOAD_URL("install.php");
 }
-// Really all done here... ;-)
-die();
 
 //
 ?>