Several more constants rewritten to getConfig()

[mailer.git] / inc / header.php

diff --git a/inc/header.php b/inc/header.php
index 5887c2944a267c748759d166e4529ffdf38618eb..da0f68cfe6ff01f6d3840fd6547486e23ec6ba32 100644 (file)
--- a/inc/header.php
+++ b/inc/header.php
@@ -65,7 +65,7 @@ if (($GLOBALS['header_sent'] != '1') && ($GLOBALS['header_sent'] != '2')) {
                                } // END - if
 
                                // Add main title
-                               $TITLE .= constant('MAIN_TITLE');
+                               $TITLE .= getConfig('MAIN_TITLE');
 
                                // Add title of module? (middle decoration will also be added!)
                                if ((getConfig('enable_mod_title') == 'Y') || ((!isWhatSet()) && (!isActionSet())) || (getModule() == 'admin')) {
@@ -85,7 +85,7 @@ if (($GLOBALS['header_sent'] != '1') && ($GLOBALS['header_sent'] != '2')) {
                                define('__PAGE_TITLE', $TITLE);
                        } elseif ((isInstalled()) && (!isAdminRegistered())) {
                                // Installed but no admin registered
-                               define('__PAGE_TITLE', sprintf(getMessage('SETUP_OF_MXCHANGE'), constant('MAIN_TITLE')));
+                               define('__PAGE_TITLE', sprintf(getMessage('SETUP_OF_MXCHANGE'), getConfig('MAIN_TITLE')));
                        } elseif ((!isInstalled()) || (!isAdminRegistered())) {
                                // Installation mode
                                define('__PAGE_TITLE', getMessage('INSTALLATION_OF_MXCHANGE'));
@@ -125,17 +125,13 @@ if (($GLOBALS['header_sent'] != '1') && ($GLOBALS['header_sent'] != '2')) {
 
        // Closing HEAD tag
        if (getOutputMode() != '1') OUTPUT_HTML('</head>');
-       $GLOBALS['header_sent'] = 1;
+       if ($GLOBALS['header_sent'] == 0) $GLOBALS['header_sent'] = 1;
 } // END - if
 
-// Load body or not
-if ((getModule() != 'frametester') || ((getModule() == 'frametester') && (REQUEST_ISSET_GET('frame'))) || (($GLOBALS['header_sent'] == '1') && (REQUEST_ISSET_GET('frame'))) && (getOutputMode() != '1')) {
-       // Is the header sent and the script is not the mail confirmation script and not a CSS?
-       if (($GLOBALS['header_sent'] == '1') && (basename($_SERVER['PHP_SELF']) != 'mailid.php') && (getOutputMode() != '1')) {
-               // Add BODY tag
-               LOAD_TEMPLATE('page_body');
-               $GLOBALS['header_sent'] = 2;
-       } // END - if
+// Add BODY tag or not?
+if ((getOutputMode() != '1') && ($GLOBALS['header_sent'] == 1)) {
+       LOAD_TEMPLATE('page_body');
+       $GLOBALS['header_sent'] = 2;
 } // END - if
 
 //