mailer project continued:

[mailer.git] / inc / header.php

diff --git a/inc/header.php b/inc/header.php
index ec433d059814d7d44eb8db719e265e58dce48b3e..1754cbf9b5b0638be15dc9d4d07629fd3fbb61e2 100644 (file)
--- a/inc/header.php
+++ b/inc/header.php
@@ -18,7 +18,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -43,10 +43,10 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Init header
-$GLOBALS['page_header'] = '';
+$GLOBALS['__page_header'] = '';
 
 // Is the header already sent?
-if (($GLOBALS['header_sent'] != 1) && ($GLOBALS['header_sent'] != 2)) {
+if (($GLOBALS['__header_sent'] != 1) && ($GLOBALS['__header_sent'] != 2)) {
        // Set default HTTP status to "200 OK"
        setHttpStatus('200 OK');
 
@@ -57,15 +57,16 @@ if (($GLOBALS['header_sent'] != 1) && ($GLOBALS['header_sent'] != 2)) {
        } // END - if
 
        // Closing HEAD tag
-       if ($GLOBALS['header_sent'] == '0') {
-               $GLOBALS['header_sent'] = 1;
+       if ($GLOBALS['__header_sent'] == '0') {
+               $GLOBALS['__header_sent'] = 1;
        } // END - if
 } // END - if
 
 // Add BODY tag or not?
-if ((!isCssOutputMode()) && (!isRawOutputMode()) && ($GLOBALS['header_sent'] == 1) && ((getModule() != 'frametester') || (isGetRequestElementSet('frame')))) {
+// @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;
+       $GLOBALS['__header_sent'] = 2;
 } // END - if
 
 // [EOF]