Fixes for stripped HTML tags, and false warnings in debug log

[mailer.git] / inc / header.php

diff --git a/inc/header.php b/inc/header.php
index 56cafa67ced876624a305e31d833bb9433d23306..723933c17985a7ec672ef9d9051dc3d6bdc868dc 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'))." ";
 
@@ -79,12 +77,6 @@ if (($header != "1") && ($header != "2")) {
                                // Remember title in constant for the template
                                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",
-                                       GET_LANGUAGE()
-                               );
-                               LOAD_INC_ONCE($FQFN);
-
                                // Installation mode
                                define('__PAGE_TITLE', getMessage('INSTALLATION_OF_MXCHANGE'));
                        } else {
@@ -108,7 +100,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 +114,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") && (REQUEST_ISSET_GET(('frame')))) || (($GLOBALS['header_sent'] == "1") && (REQUEST_ISSET_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