and rewritten to functions

[mailer.git] / inc / header.php

diff --git a/inc/header.php b/inc/header.php
index b04464c288b41d04cecd8a1d69f84c2685bae5d1..650dce7dddc31d60ba1a836acfaaa2eac9acda57 100644 (file)
--- a/inc/header.php
+++ b/inc/header.php
@@ -39,19 +39,17 @@ if (!defined('__SECURITY')) {
        require($INC);
 }
 
-global $header;
-
 // Is the header already sent?
-if (($header != "1") && ($header != "2")) {
+if (($GLOBALS['header_sent'] != "1") && ($GLOBALS['header_sent'] != "2")) {
        // If not in CSS mode generate the header
-       if (($CSS != "1")) {
+       if (($GLOBALS['output_mode'] != "1")) {
                // Generate header
                $TITLE = "";
 
                // Add title decorations? (left)
                if (!defined('__PAGE_TITLE')) {
                        // Config and database connection valid?
-                       if ((isset($_CONFIG)) && (is_array($_CONFIG)) && (count($_CONFIG) > 1) && (is_resource($link)) && (isset($db))) {
+                       if ((isset($_CONFIG)) && (is_array($_CONFIG)) && (count($_CONFIG) > 1) && (SQL_IS_LINK_UP())) {
                                // Title decoration enabled?
                                if ((getConfig('enable_title_deco') == "Y") && (getConfig('title_left') != "")) $TITLE .= trim(getConfig('title_left'))." ";
 
@@ -62,7 +60,7 @@ if (($header != "1") && ($header != "2")) {
                                } // END - if
 
                                // Add main title
-                               $TITLE .= MAIN_TITLE;
+                               $TITLE .= constant('MAIN_TITLE');
 
                                // Add title of module? (middle decoration will also be added!)
                                if ((getConfig('enable_mod_title') == "Y") || ((empty($GLOBALS['what'])) && (empty($GLOBALS['action']))) || ($GLOBALS['module'] == "admin")) $TITLE .= " ".trim(getConfig('title_middle'))." ".ADD_MODULE_TITLE($GLOBALS['module']);
@@ -77,7 +75,7 @@ if (($header != "1") && ($header != "2")) {
                                if ((getConfig('enable_title_deco') == "Y") && (getConfig('title_right') != "")) $TITLE .= " ".trim(getConfig('title_right'));
 
                                // Remember title in constant for the template
-                               define('__PAGE_TITLE', html_entity_decode($TITLE));
+                               define('__PAGE_TITLE', $TITLE);
                        } elseif ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndTrue('admin_registered'))) {
                                // Load language file because it was missing in installation finalizer step... *sigh*
                                $FQFN = sprintf("inc/language/install_%s.php",
@@ -108,7 +106,7 @@ if (($header != "1") && ($header != "2")) {
                        LOAD_TEMPLATE("metadata");
 
                        // Add meta description to header
-                       if ((isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('admin_registered')) && (isset($db)) && (is_resource($link))) {
+                       if ((isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('admin_registered')) && (SQL_IS_LINK_UP())) {
                                // Add meta description not in admin and login module and when the script is installed
                                META_DESCRIPTION($GLOBALS['module'], $GLOBALS['what']);
                        } // END - if
@@ -122,17 +120,17 @@ if (($header != "1") && ($header != "2")) {
        } // END - if
 
        // Closing HEAD tag
-       if ($CSS != "1") OUTPUT_HTML("</head>");
-       $header = 1;
+       if ($GLOBALS['output_mode'] != "1") OUTPUT_HTML("</head>");
+       $GLOBALS['header_sent'] = 1;
 } // END - if
 
 // Load body or not
-if (($GLOBALS['module'] != "frametester") || (($GLOBALS['module'] == "frametester") && (isset($_GET['frame']))) || (($header == "1") && (!empty($_GET['frame']))) && ($CSS != "1")) {
+if (($GLOBALS['module'] != "frametester") || (($GLOBALS['module'] == "frametester") && (isset($_GET['frame']))) || (($GLOBALS['header_sent'] == "1") && (!empty($_GET['frame']))) && ($GLOBALS['output_mode'] != "1")) {
        // Is the header sent and the script is not the mail confirmation script and not a CSS?
-       if (($header == "1") && (basename($_SERVER['PHP_SELF']) != "mailid.php") && ($CSS != "1")) {
+       if (($GLOBALS['header_sent'] == "1") && (basename($_SERVER['PHP_SELF']) != "mailid.php") && ($GLOBALS['output_mode'] != "1")) {
                // Add BODY tag
                LOAD_TEMPLATE("page_body");
-               $header = 2;
+               $GLOBALS['header_sent'] = 2;
        } // END - if
 } // END - if