X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mailid.php;h=d1bae743d07eda8393ac191dcb1d2ff5581e6847;hb=3db876e775c0651ffdf15234f5d5c7a4eae4033c;hp=97f943890e53dc2699f34a4b03a805d07015891e;hpb=f01652b7b8efac92d97889e312402c4a845c2f14;p=mailer.git

diff --git a/mailid.php b/mailid.php
index 97f943890e..d1bae743d0 100644
--- a/mailid.php
+++ b/mailid.php
@@ -42,14 +42,13 @@ $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
 $GLOBALS['module'] = "mailid"; $CSS = -1;
 
 // Load the required file(s)
-require ("inc/config.php");
+require_once("inc/config.php");
 
-if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_installed')))
-{
+if (isBooleanConstantAndTrue('mxchange_installed')) {
 	// Is the extension active
 	if (!EXT_IS_ACTIVE("mailid", true)) {
 		// Is not activated/installed yet!
-		LOAD_URL("modules.php?module=index&msg=".CODE_EXTENSION_PROBLEM);
+		LOAD_URL("modules.php?module=index&msg=".CODE_EXTENSION_PROBLEM."&ext=mailid");
 	} // END - if
 
 	// Init
@@ -60,20 +59,18 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 	if (!empty($_GET['mailid']))  $url_mid = bigintval($_GET['mailid']);
 	if (!empty($_GET['bonusid'])) $url_bid = bigintval($_GET['bonusid']);
 
-	//* 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)) {
+	// 01        1        12            3    32           21    1                   22     10
+	if (($url_uid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors() == 0)) {
 		// 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"; $DATA = $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"; $DATA = $url_bid;
 		} else {
 			// Problem: No ID entered
@@ -91,31 +88,36 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 			{
 			case "NORMAL":
 				// 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__);
+				$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);
+					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, subject FROM "._MYSQL_PREFIX."_bonus WHERE id=%s LIMIT 1",
-				 array($url_bid), __FILE__, __LINE__);
+				$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, $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, 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);
@@ -124,8 +126,8 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 						switch ($ltype)
 						{
 						case "NORMAL":
-							$result = SQL_QUERY_ESC("SELECT payment_id FROM "._MYSQL_PREFIX."_user_stats WHERE pool_id=%s LIMIT 1",
-							 array(bigintval($pool)), __FILE__, __LINE__);
+							$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)
 							{
 								list($pay) = SQL_FETCHROW($result);
@@ -139,8 +141,8 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 							break;
 
 						case "BONUS":
-							$result = SQL_QUERY_ESC("SELECT points, time FROM "._MYSQL_PREFIX."_bonus WHERE id=%s LIMIT 1",
-							 array($url_bid), __FILE__, __LINE__);
+							$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)
 							{
 								list($points, $time) = SQL_FETCHROW($result);
@@ -154,12 +156,12 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 						}
 
 						// Add header
-						require_once(PATH."inc/header.php");
+						LOAD_INC_ONCE("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)) { $URL = constant('URL'); $time = "1"; }
 							if (($time > 0) && (($payment > 0) || ($points > 0))) {
 								// He can confirm this mail!
 								// Export data into constants for the template
@@ -198,21 +200,26 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 
 	// Error code is set?
 	if (!empty($msg)) {
-		switch ($_CONFIG['mailid_error_redirect']) {
+		switch (getConfig('mailid_error_redirect')) {
 			case "INDEX": // Redirect to index page
-				LOAD_URL("modules.php?module=index&msg=".$msg);
+				LOAD_URL("modules.php?module=index&amp;msg=".$msg."&amp;ext=mailid");
 				break;
 
 			case "REJECT": // Redirect to rejection page
-				LOAD_URL($_CONFIG['reject_url']);
+				LOAD_CONFIGURED_URL('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");
+		LOAD_INC_ONCE("inc/footer.php");
 	}
 } else {
-	// You have to configure first!
+	// You have to install first!
 	LOAD_URL("install.php");
 }