But only when it is not empty

[mailer.git] / inc / header.php

diff --git a/inc/header.php b/inc/header.php
index 06f8f74daa9e34cb9d44660525d4d3bf8f53444b..7dbc6b3e324e7825e7828fd7c5285a4f985ab5a1 100644 (file)
--- a/inc/header.php
+++ b/inc/header.php
@@ -16,12 +16,10 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -45,24 +43,30 @@ 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');
+
        // If not in CSS mode generate the header
-       if (getOutputMode() != 1) {
+       if ((!isCssOutputMode()) && (!isAjaxOutputMode()) && (!isImageOutputMode())) {
                // Prepare the header for HTML output
                loadHtmlHeader();
        } // 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 ((getOutputMode() != 1) && (getOutputMode() != -1) && ($GLOBALS['header_sent'] == 1) && ((getModule() != 'frametester') || (isGetRequestParameterSet('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]