Renamed function so it might be more understandable

[mailer.git] / inc / header.php

diff --git a/inc/header.php b/inc/header.php
index 05ad10994f37ddc9028c6bf9c71b2ef7352619d5..3e6921a96e7c1f3c29c975100044207032d4b309 100644 (file)
--- a/inc/header.php
+++ b/inc/header.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 08/25/2003 *
- * ===============                              Last change: 11/24/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 08/25/2003 *
+ * ===================                          Last change: 11/24/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : 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,42 +42,26 @@ 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)) {
-       // If not in CSS mode generate the header
-       if (getOutputMode() != 1) {
-               // Determine the page title
-               $content['header_title'] = determinePageTitle();
-
-               // Output page header code
-               loadTemplate('page_header', false, $content);
-
-               // Include meta data in 'guest' module
-               if (getModule() == 'index') {
-                       // Load meta data template
-                       loadTemplate('metadata');
+       // Set default HTTP status to "200 OK"
+       setHttpStatus('200 OK');
 
-                       // Add meta description to header
-                       if ((isInstalled()) && (isAdminRegistered()) && (SQL_IS_LINK_UP())) {
-                               // Add meta description not in admin and login module and when the script is installed
-                               generateMetaDescriptionCode(getModule(), getWhat());
-                       } // END - if
-               } // END - if
-
-               // Include more header data here
-               loadTemplate('header');
-
-               // Include stylesheet
-               loadIncludeOnce('inc/stylesheet.php');
+       // If not in CSS mode generate the header
+       if (!isCssOutputMode()) {
+               // Prepare the header for HTML output
+               loadHtmlHeader();
        } // END - if
 
        // Closing HEAD tag
-       if (getOutputMode() != 1) outputHtml('</head>');
        if ($GLOBALS['header_sent'] == '0') $GLOBALS['header_sent'] = 1;
 } // END - if
 
 // Add BODY tag or not?
-if ((getOutputMode() != 1) && (getOutputMode() != -1) && ($GLOBALS['header_sent'] == 1) && ((getModule() != 'frametester') || (isGetRequestElementSet('frame')))) {
+if ((!isCssOutputMode()) && (!isRawOutputMode()) && ($GLOBALS['header_sent'] == 1) && ((getModule() != 'frametester') || (isGetRequestParameterSet('frame')))) {
        loadTemplate('page_body');
        $GLOBALS['header_sent'] = 2;
 } // END - if