X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=mailid.php;h=a1b85addaad04d28b3a00b67fdfea1f53e31fdf1;hp=86a71fca41ee21ed368a543f7e9a55c35ee0b013;hb=4373e155854012d687fdfcae4c69d1a940883fab;hpb=155492a5b96cec674846973a8524238b0365a848

diff --git a/mailid.php b/mailid.php
index 86a71fca41..a1b85addaa 100644
--- a/mailid.php
+++ b/mailid.php
@@ -55,10 +55,10 @@ require('inc/config-global.php');
 setContentType('text/html');
 setHttpStatus('404 Not Found');
 
-// Is the extension mailid active?
+// Is ext-mailid active?
 redirectOnUninstalledExtension('mailid');
 
-// Is the extension other active?
+// Is ext-other active?
 redirectOnUninstalledExtension('other');
 
 // Init data
@@ -80,19 +80,19 @@ if (isGetRequestElementSet('type'))   $data['type']   = getRequestElement('type'
 
 // @TODO Improve check on $data['type'], empty() is not very much ...
 if ((isValidId($data['userid'])) && (isValidId($data['id'])) && (!empty($data['type'])) && (!ifFatalErrorsDetected())) {
-	// No image?
-	if ($data['do'] != 'img') {
-		// ... then output header
-		loadIncludeOnce('inc/header.php');
-	} // END - fi
-
 	// Is 'do' still "frames"?
 	if ($data['do'] == 'frames') {
 		// This is a frameset module
 		$GLOBALS['frameset_mode'] = TRUE;
 	} // END - if
 
-	// Init result for below SQL_NUMROWS() function
+	// No image?
+	if ($data['do'] != 'img') {
+		// ... then output header
+		loadIncludeOnce('inc/header.php');
+	} // END - fi
+
+	// Init result for below sqlNumRows() function
 	$result_main = FALSE;
 
 	// Maybe he wants to confirm an email?
@@ -123,12 +123,12 @@ if ((isValidId($data['userid'])) && (isValidId($data['id'])) && (!empty($data['t
 		// @TODO Rewrite this to a filter/function
 		switch ($data['link_type']) {
 			case 'NORMAL':
-				$result_mailid = sqlQueryEscaped("SELECT `pool_id`, `userid` AS `sender` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
+				$result_mailid = sqlQueryEscaped("SELECT `pool_id`, `userid` AS `sender`, `url` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
 					array($data['id']), __FILE__, __LINE__);
 				break;
 
 			case 'BONUS':
-				$result_mailid = sqlQueryEscaped("SELECT `id` AS `pool_id`, `is_notify` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+				$result_mailid = sqlQueryEscaped("SELECT `id` AS `pool_id`, `is_notify`, `url` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
 					array($data['id']), __FILE__, __LINE__);
 				break;