X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fheader.php;h=7dbc6b3e324e7825e7828fd7c5285a4f985ab5a1;hb=082398d5872064d3911c62b085e8a134569f626b;hp=2d4a25c4553631ffee886a27cd3c8cfb08c1b962;hpb=1c4a8db23b33255c699124c2f5905695865d1d20;p=mailer.git diff --git a/inc/header.php b/inc/header.php index 2d4a25c455..7dbc6b3e32 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] ?>