config.php partly solved, see #117

[mailer.git] / inc / header.php

diff --git a/inc/header.php b/inc/header.php
index 5c904093df1782a87afb5070670b04b1e3632f5f..9afbe993d24e72c7a1b70be2020d6e0afef68b12 100644 (file)
--- a/inc/header.php
+++ b/inc/header.php
@@ -45,9 +45,9 @@ if (!defined('__SECURITY')) {
 }
 
 // Is the header already sent?
-if (($GLOBALS['header_sent'] != "1") && ($GLOBALS['header_sent'] != "2")) {
+if (($GLOBALS['header_sent'] != '1') && ($GLOBALS['header_sent'] != '2')) {
        // If not in CSS mode generate the header
-       if (($GLOBALS['output_mode'] != "1")) {
+       if (($GLOBALS['output_mode'] != '1')) {
                // Generate header
                $TITLE = '';
 
@@ -59,9 +59,9 @@ if (($GLOBALS['header_sent'] != "1") && ($GLOBALS['header_sent'] != "2")) {
                                if ((getConfig('enable_title_deco') == 'Y') && (getConfig('title_left') != '')) $TITLE .= trim(getConfig('title_left'))." ";
 
                                // Do we have some extra title?
-                               if (!empty($EXTRA_TITLE)) {
+                               if (isExtraTitleSet()) {
                                        // Then prepent it
-                                       $TITLE .= $EXTRA_TITLE." by ";
+                                       $TITLE .= getExtraTitle() . ' by ';
                                } // END - if
 
                                // Add main title
@@ -81,9 +81,12 @@ if (($GLOBALS['header_sent'] != "1") && ($GLOBALS['header_sent'] != "2")) {
 
                                // Remember title in constant for the template
                                define('__PAGE_TITLE', $TITLE);
+                       } elseif ((isInstalled()) && (!isAdminRegistered())) {
+                               // Installed but no admin registered
+                               define('__PAGE_TITLE', sprintf(getMessage('SETUP_OF_MXCHANGE'), constant('MAIN_TITLE')));
                        } elseif ((!isInstalled()) || (!isAdminRegistered())) {
                                // Installation mode
-                               define('__PAGE_TITLE', sprintf(getMessage('INSTALLATION_OF_MXCHANGE'), constant('MAIN_TITLE')));
+                               define('__PAGE_TITLE', getMessage('INSTALLATION_OF_MXCHANGE'));
                        } else {
                                // Configuration not found!
                                define('__PAGE_TITLE', getMessage('NO_CONFIG_FOUND_TITLE'));
@@ -97,12 +100,12 @@ if (($GLOBALS['header_sent'] != "1") && ($GLOBALS['header_sent'] != "2")) {
                unset($TITLE);
 
                // Output page header code
-               LOAD_TEMPLATE("page_header");
+               LOAD_TEMPLATE('page_header');
 
                // Include meta data in 'guest' module
                if ($GLOBALS['module'] == 'index') {
                        // Load meta data template
-                       LOAD_TEMPLATE("metadata");
+                       LOAD_TEMPLATE('metadata');
 
                        // Add meta description to header
                        if ((isInstalled()) && (isAdminRegistered()) && (SQL_IS_LINK_UP())) {
@@ -112,23 +115,23 @@ if (($GLOBALS['header_sent'] != "1") && ($GLOBALS['header_sent'] != "2")) {
                } // END - if
 
                // Include more header data here
-               LOAD_TEMPLATE("header");
+               LOAD_TEMPLATE('header');
 
                // Include stylesheet
-               loadIncludeOnce("inc/stylesheet.php");
+               loadIncludeOnce('inc/stylesheet.php');
        } // END - if
 
        // Closing HEAD tag
-       if ($GLOBALS['output_mode'] != "1") OUTPUT_HTML("</head>");
+       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") && (REQUEST_ISSET_GET(('frame')))) || (($GLOBALS['header_sent'] == "1") && (REQUEST_ISSET_GET(('frame')))) && ($GLOBALS['output_mode'] != "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 (($GLOBALS['header_sent'] == "1") && (basename($_SERVER['PHP_SELF']) != "mailid.php") && ($GLOBALS['output_mode'] != "1")) {
+       if (($GLOBALS['header_sent'] == '1') && (basename($_SERVER['PHP_SELF']) != 'mailid.php') && ($GLOBALS['output_mode'] != '1')) {
                // Add BODY tag
-               LOAD_TEMPLATE("page_body");
+               LOAD_TEMPLATE('page_body');
                $GLOBALS['header_sent'] = 2;
        } // END - if
 } // END - if