X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mailid.php;h=3fb1eaafab8b25fef84e5b702206972939a6853e;hb=1c484a7c07cd695f22dc8211d9145b73a296ecc4;hp=fe2c59e7ab54ee16c4c52073eacb77fa80a43c6a;hpb=d798a412acb8c1263933bd7f7a0fd9aa251495a7;p=mailer.git

diff --git a/mailid.php b/mailid.php
index fe2c59e7ab..3fb1eaafab 100644
--- a/mailid.php
+++ b/mailid.php
@@ -59,10 +59,8 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
 	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
@@ -118,7 +116,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
 				$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",
+				$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);
@@ -202,17 +200,17 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
 
 	// 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&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.", $_CONFIG['mailid_error_redirect']));
+				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;
 		}
@@ -221,7 +219,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
 		require_once(PATH."inc/footer.php");
 	}
 } else {
-	// You have to configure first!
+	// You have to install first!
 	LOAD_URL("install.php");
 }