X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fheader.php;h=6b265c89d399883ee7ebcb5eecbc98406f7971aa;hb=b1cf96c4a5a63a1d334119a0681e5fbf68edf527;hp=45b1caa4d6963b699d8dad1468a2443a3cac7fe9;hpb=a090e351c49fe021fb3064325694da03402332e0;p=mailer.git diff --git a/inc/header.php b/inc/header.php index 45b1caa4d6..6b265c89d3 100644 --- a/inc/header.php +++ b/inc/header.php @@ -1,7 +1,7 @@ "); - $GLOBALS['header_sent'] = 1; + if (getOutputMode() != 1) outputHtml(''); + if ($GLOBALS['header_sent'] == '0') $GLOBALS['header_sent'] = 1; } // 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? +if ((getOutputMode() != 1) && (getOutputMode() != -1) && ($GLOBALS['header_sent'] == 1) && ((getModule() != 'frametester') || (isGetRequestElementSet('frame')))) { + loadTemplate('page_body'); + $GLOBALS['header_sent'] = 2; } // END - if -// +// [EOF] ?>