Introduced new image output mode #2

diff --git a/inc/footer.php b/inc/footer.php
index 6d84c2d2a5baa23b745a9b65940906c2bd2d3d32..e9c5abe777e874275ea718de2b50cc0fd50b0601 100644 (file)
--- a/inc/footer.php
+++ b/inc/footer.php
@@ -44,8 +44,8 @@ if (!defined('__SECURITY')) {
 $GLOBALS['page_footer'] = '';
 
 // Footer disabled or already sent?
 $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');
 
        // Run the filter, sweet huh?
        runFilterChain('page_footer');
 

diff --git a/inc/header.php b/inc/header.php
index 740e324dd95f19e6483dd58b2ad7c3dae473c411..ec433d059814d7d44eb8db719e265e58dce48b3e 100644 (file)
--- 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
        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
                // Prepare the header for HTML output
                loadHtmlHeader();
        } // END - if

diff --git a/inc/http-functions.php b/inc/http-functions.php
index 9398678b10d3ec170bf7e798b1508ddf25a3e39e..bc100696a93a571a8824d8b218f04552e188ec96 100644 (file)
--- 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('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());
 }
 
        addHttpHeader('Content-Language: ' . getLanguage());
 }