X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fheader.php;h=1754cbf9b5b0638be15dc9d4d07629fd3fbb61e2;hb=77669502ccc2779d32a842f6d523fb68169fadda;hp=1cd75b12c390618e3aecb4a26ef8a799867294f9;hpb=414570c5081d337bb6c28dcf521bd8bca02f69e7;p=mailer.git diff --git a/inc/header.php b/inc/header.php index 1cd75b12c3..1754cbf9b5 100644 --- a/inc/header.php +++ b/inc/header.php @@ -1,7 +1,7 @@ "); - $GLOBALS['header_sent'] = 1; + if ($GLOBALS['__header_sent'] == '0') { + $GLOBALS['__header_sent'] = 1; + } // END - if } // END - if -// Load body or not -if (($GLOBALS['module'] != "frametester") || (($GLOBALS['module'] == "frametester") && (REQUEST_ISSET_GET(('frame')))) || (($GLOBALS['header_sent'] == "1") && (REQUEST_ISSET_GET(('frame')))) && ($GLOBALS['output_mode'] != "1")) { - // Is the header sent and the script is not the mail confirmation script and not a CSS? - if (($GLOBALS['header_sent'] == "1") && (basename($_SERVER['PHP_SELF']) != "mailid.php") && ($GLOBALS['output_mode'] != "1")) { - // Add BODY tag - LOAD_TEMPLATE("page_body"); - $GLOBALS['header_sent'] = 2; - } // END - if +// Add BODY tag or not? +// @TODO Find a way to not use direct module comparison +if ((!isCssOutputMode()) && (!isRawOutputMode()) && ($GLOBALS['__header_sent'] == 1) && (getModule() != 'frametester') && (!isFramesetModeEnabled())) { + loadTemplate('page_body'); + $GLOBALS['__header_sent'] = 2; } // END - if -// +// [EOF] ?>