Renamed function so it might be more understandable

[mailer.git] / inc / header.php

diff --git a/inc/header.php b/inc/header.php
index d87acc2edd4c7cec0b34a2d2d8c9132e16364fa8..3e6921a96e7c1f3c29c975100044207032d4b309 100644 (file)
--- a/inc/header.php
+++ b/inc/header.php
@@ -16,10 +16,9 @@
  * $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                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -43,10 +42,16 @@ if (!defined('__SECURITY')) {
        die();
 } // END - if
 
+// Init header
+$GLOBALS['page_header'] = '';
+
 // Is the header already sent?
 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()) {
                // Prepare the header for HTML output
                loadHtmlHeader();
        } // END - if
@@ -56,7 +61,7 @@ if (($GLOBALS['header_sent'] != 1) && ($GLOBALS['header_sent'] != 2)) {
 } // END - if
 
 // Add BODY tag or not?
-if ((getOutputMode() != 1) && (getOutputMode() != -1) && ($GLOBALS['header_sent'] == 1) && ((getModule() != 'frametester') || (isGetRequestParameterSet('frame')))) {
+if ((!isCssOutputMode()) && (!isRawOutputMode()) && ($GLOBALS['header_sent'] == 1) && ((getModule() != 'frametester') || (isGetRequestParameterSet('frame')))) {
        loadTemplate('page_body');
        $GLOBALS['header_sent'] = 2;
 } // END - if