X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mailid.php;h=cebf439e9ad3179ee521c8f9f41906ee15bd650e;hb=8975d55c697ec1bec2cdacc2c3b965b6add16a03;hp=21cbc8922d77b75c48d4cf9d90225aadb0379056;hpb=f2b603aed42bfdf7a94611d7bae71fe3a1048890;p=mailer.git

diff --git a/mailid.php b/mailid.php
index 21cbc8922d..cebf439e9a 100644
--- a/mailid.php
+++ b/mailid.php
@@ -10,13 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Bestaetigung von Mails                           *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2016 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -48,17 +43,17 @@ $GLOBALS['__output_mode'] = '0';
 // Disable copyright footer which would be to large for the upper frame
 $GLOBALS['__copyright_enabled'] = 'N';
 
-// Load the required file(s)
-require('inc/config-global.php');
+// Initialize application
+require('inc/init.php');
 
 // Set content type and HTTP status
 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,18 +75,18 @@ 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
 
+	// No image?
+	if ($data['do'] != 'img') {
+		// ... then output header
+		loadPageHeader();
+	} // END - fi
+
 	// Init result for below sqlNumRows() function
 	$result_main = FALSE;
 
@@ -123,12 +118,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;
 
@@ -254,7 +249,7 @@ handleMailIdErrorCode($data['error_code']);
 // Insert footer if no image
 if ($data['do'] != 'img') {
 	// Write footer
-	loadIncludeOnce('inc/footer.php');
+	loadPageFooter();
 } // END - if
 
 // Really all done here... ;-)