X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=mailid.php;h=a913ef06ff0a1b5e2472c21667ee0a04ee2ad802;hp=027898174b21f05a2f4dc0a3b4f71f54419d7ef5;hb=c14a130863bb037b00fceabd099a202eb4a5b2d8;hpb=541d2d03d7fac53d38b5d4236d1c35fb5f1f526b

diff --git a/mailid.php b/mailid.php
index 027898174b..a913ef06ff 100644
--- a/mailid.php
+++ b/mailid.php
@@ -44,12 +44,12 @@ $GLOBALS['module'] = "mailid"; $CSS = -1;
 // Load the required file(s)
 require ("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
@@ -99,7 +99,7 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 				// Is the bonus extension active?
 				if (!EXT_IS_ACTIVE("bonus")) {
 					// Abort here
-					LOAD_URL("modules.php?module=index&msg=".CODE_EXTENSION_PROBLEM);
+					LOAD_URL("modules.php?module=index&msg=".CODE_EXTENSION_PROBLEM."&ext=mailid");
 				} // END - if
 
 				// Bonus-Mails
@@ -111,13 +111,18 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 			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, sex, surname, family FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s 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...
@@ -200,12 +205,17 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 	if (!empty($msg)) {
 		switch ($_CONFIG['mailid_error_redirect']) {
 			case "INDEX": // Redirect to index page
-				LOAD_URL("modules.php?module=index&msg=".$msg);
+				LOAD_URL("modules.php?module=index&msg=".$msg."&ext=mailid");
 				break;
 
 			case "REJECT": // Redirect to rejection page
 				LOAD_URL($_CONFIG['reject_url']);
 				break;
+
+			default:
+				DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown status %s detected in mailid_error_redirect.", $_CONFIG['mailid_error_redirect']));
+				LOAD_URL("modules.php?module=index&msg=".CODE_UNKNOWN_STATUS."&ext=mailid");
+				break;
 		}
 	} else {
 		// Include footer