Reverted of changes in 1704, see ticket #160

[mailer.git] / inc / header.php

diff --git a/inc/header.php b/inc/header.php
index 6b265c89d399883ee7ebcb5eecbc98406f7971aa..06f8f74daa9e34cb9d44660525d4d3bf8f53444b 100644 (file)
--- a/inc/header.php
+++ b/inc/header.php
@@ -20,6 +20,7 @@
  * 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 +44,23 @@ 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');
-
-                       // 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');
+               // 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 ((getOutputMode() != 1) && (getOutputMode() != -1) && ($GLOBALS['header_sent'] == 1) && ((getModule() != 'frametester') || (isGetRequestParameterSet('frame')))) {
        loadTemplate('page_body');
        $GLOBALS['header_sent'] = 2;
 } // END - if