From: Roland Häder <roland@mxchange.org>
Date: Thu, 29 Sep 2011 00:30:25 +0000 (+0000)
Subject: Introduced new image output mode #2
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=262c3e87d0a80ec8a4435b2564d4b666fd329bf6;p=mailer.git

Introduced new image output mode #2
---

diff --git a/inc/footer.php b/inc/footer.php
index 6d84c2d2a5..e9c5abe777 100644
--- a/inc/footer.php
+++ b/inc/footer.php
@@ -44,8 +44,8 @@ if (!defined('__SECURITY')) {
 $GLOBALS['page_footer'] = '';
 
 // Footer disabled or already sent?
-// 1234      5                       54    45                            5    5                            543    3                44321
-if ((((!isset($GLOBALS['footer_sent'])) || (($GLOBALS['footer_sent'] != 1) && ($GLOBALS['footer_sent'] != 2))) && (!isCssOutputMode()))) {
+// 1234      5                       54    45                            5    5                            543    3                443    3                 443    3                  44321
+if ((((!isset($GLOBALS['footer_sent'])) || (($GLOBALS['footer_sent'] != 1) && ($GLOBALS['footer_sent'] != 2))) && (!isCssOutputMode()) && (!isAjaxOutputMode()) && (!isImageOutputMode()))) {
 	// Run the filter, sweet huh?
 	runFilterChain('page_footer');
 
diff --git a/inc/header.php b/inc/header.php
index 740e324dd9..ec433d0598 100644
--- a/inc/header.php
+++ b/inc/header.php
@@ -51,7 +51,7 @@ if (($GLOBALS['header_sent'] != 1) && ($GLOBALS['header_sent'] != 2)) {
 	setHttpStatus('200 OK');
 
 	// If not in CSS mode generate the header
-	if (!isCssOutputMode()) {
+	if ((!isCssOutputMode()) && (!isAjaxOutputMode()) && (!isImageOutputMode())) {
 		// Prepare the header for HTML output
 		loadHtmlHeader();
 	} // END - if
diff --git a/inc/http-functions.php b/inc/http-functions.php
index 9398678b10..bc100696a9 100644
--- a/inc/http-functions.php
+++ b/inc/http-functions.php
@@ -54,7 +54,13 @@ function sendHttpHeaders () {
 	addHttpHeader('Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
 	addHttpHeader('Pragma: no-cache'); // HTTP/1.0
 	addHttpHeader('Connection: Close');
-	addHttpHeader('Content-Type: ' . getContentType() . '; charset=UTF-8');
+	// There shall be no output mode in raw/AJAX mode
+	if ((!isRawOutputMode()) && (!isAjaxOutputMode())) {
+		// Send content-type only in CSS/HTML mode
+		addHttpHeader('Content-Type: ' . getContentType() . '; charset=UTF-8');
+	} else {
+		//
+	} // END - if
 	addHttpHeader('Content-Language: ' . getLanguage());
 }