Previous fix fixed, a lot constants rewritten (unfinished)

[mailer.git] / inc / header.php

diff --git a/inc/header.php b/inc/header.php
index 8f2d54deae8f6518ec0d94e4a5a4b05c0ce70e83..6c85f0bfaf70fb095a381cc5dabc69d53aa65c4a 100644 (file)
--- a/inc/header.php
+++ b/inc/header.php
@@ -39,9 +39,9 @@ if (!defined('__SECURITY')) {
        require($INC);
 }
 
-// Initialize variables
-if (!isset($header)) $header = 0;
+global $header;
 
+// Is the header already sent?
 if (($header != "1") && ($header != "2")) {
        // If not in CSS mode generate the header
        if (($CSS != "1")) {
@@ -53,7 +53,7 @@ if (($header != "1") && ($header != "2")) {
                        // Config and database connection valid?
                        if ((isset($_CONFIG)) && (is_array($_CONFIG)) && (count($_CONFIG) > 1) && (is_resource($link)) && (isset($db))) {
                                // Title decoration enabled?
-                               if (($_CONFIG['enable_title_deco'] == "Y") && (!empty($_CONFIG['title_left']))) $TITLE .= trim($_CONFIG['title_left'])." ";
+                               if ((getConfig('enable_title_deco') == "Y") && (getConfig('title_left') != "")) $TITLE .= trim(getConfig('title_left'))." ";
 
                                // Do we have some extra title?
                                if (!empty($EXTRA_TITLE)) {
@@ -65,18 +65,16 @@ if (($header != "1") && ($header != "2")) {
                                $TITLE .= MAIN_TITLE;
 
                                // Add title of module? (middle decoration will also be added!)
-                               if (isset($_CONFIG['enable_mod_title'])) {
-                                       if (($_CONFIG['enable_mod_title'] == "Y") || ((empty($GLOBALS['what'])) && (empty($GLOBALS['action']))) || ($GLOBALS['module'] == "admin")) $TITLE .= " ".trim($_CONFIG['title_middle'])." ".ADD_MODULE_TITLE($GLOBALS['module']);
-                               } // END - if
+                               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']);
 
                                // Add title from what file
                                $MODE = "";
                                if ($GLOBALS['module'] == "login") $MODE = "member";
                                 elseif ($GLOBALS['module'] == "index") $MODE = "guest";
-                               if ((!empty($MODE)) && (isset($_CONFIG['enable_what_title'])) && ($_CONFIG['enable_what_title'] == "Y")) $TITLE .= " ".trim($_CONFIG['title_middle'])." ".GET_MOD_DESCR($MODE, $GLOBALS['what']);
+                               if ((!empty($MODE)) && (getConfig('enable_what_title') == "Y")) $TITLE .= " ".trim(getConfig('title_middle'))." ".GET_MOD_DESCR($MODE, $GLOBALS['what']);
 
                                // Add title decorations? (right)
-                               if (($_CONFIG['enable_title_deco'] == "Y") && (!empty($_CONFIG['title_right']))) $TITLE .= " ".trim($_CONFIG['title_right']);
+                               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));
@@ -88,15 +86,15 @@ if (($header != "1") && ($header != "2")) {
                                ));
 
                                // Installation mode
-                               define('__PAGE_TITLE', INSTALLATION_OF_MXCHANGE);
+                               define('__PAGE_TITLE', getMessage('INSTALLATION_OF_MXCHANGE'));
                        } else {
                                // Configuration not found!
-                               define('__PAGE_TITLE', NO_CONFIG_FOUND_TITLE);
+                               define('__PAGE_TITLE', getMessage('NO_CONFIG_FOUND_TITLE'));
 
                                // Do not add the fatal message in installation mode
-                               if (basename($_SERVER['PHP_SELF']) != "install.php") ADD_FATAL(NO_CONFIG_FOUND);
+                               if (basename($_SERVER['PHP_SELF']) != "install.php") addFatalMessage(getMessage('NO_CONFIG_FOUND'));
                        }
-               }
+               } // END - if
 
                // Save some little memory
                unset($TITLE);
@@ -104,20 +102,23 @@ if (($header != "1") && ($header != "2")) {
                // Output page header code
                LOAD_TEMPLATE("page_header");
 
-               // Include meta data here
-               LOAD_TEMPLATE("metadata");
+               // Include meta data in "guest" module
+               if ($GLOBALS['module'] == "index") {
+                       // Load meta data template
+                       LOAD_TEMPLATE("metadata");
 
-               // Add meta description to header
-               if ((isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('admin_registered')) && ($GLOBALS['module'] != "admin") && ($GLOBALS['module'] != "login") && (isset($db)) && (isset($link))) {
-                       // Add meta description not in admin and login module and when the script is installed
-                       META_DESCRIPTION($GLOBALS['module'], $GLOBALS['what']);
+                       // Add meta description to header
+                       if ((isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('admin_registered')) && (isset($db)) && (is_resource($link))) {
+                               // Add meta description not in admin and login module and when the script is installed
+                               META_DESCRIPTION($GLOBALS['module'], $GLOBALS['what']);
+                       } // END - if
                } // END - if
 
                // Include more header data here
                LOAD_TEMPLATE("header");
 
                // Include stylesheet
-               include (PATH."inc/stylesheet.php");
+               require_once(PATH."inc/stylesheet.php");
        } // END - if
 
        // Closing HEAD tag
@@ -126,7 +127,7 @@ if (($header != "1") && ($header != "2")) {
 } // END - if
 
 // Load body or not
-if (((!$isFrameset) && ($GLOBALS['module'] != "frametester")) || (($GLOBALS['module'] == "frametester") && (isset($_GET['frame']))) || (($header == "1") && ($isFrameset) && (!empty($_GET['frame']))) && ($CSS != "1")) {
+if (($GLOBALS['module'] != "frametester") || (($GLOBALS['module'] == "frametester") && (isset($_GET['frame']))) || (($header == "1") && (!empty($_GET['frame']))) && ($CSS != "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")) {
                // Add BODY tag