More misc fixes and rewrites (sorry, lame description)

[mailer.git] / inc / header.php

diff --git a/inc/header.php b/inc/header.php
index f6897807644b0d10747afaeb403b23897234d489..aa10f9daed701f9be923f9ea6c5b0b46976067d9 100644 (file)
--- a/inc/header.php
+++ b/inc/header.php
@@ -40,50 +40,55 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
 
 // 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 ((getOutputMode() != '1')) {
                // Generate header
-               $TITLE = "";
+               $TITLE = '';
 
                // Add title decorations? (left)
                if (!defined('__PAGE_TITLE')) {
                        // Config and database connection valid?
-                       if ((isConfigLoaded()) && (SQL_IS_LINK_UP())) {
+                       if ((isConfigLocalLoaded()) && (isConfigLoaded()) && (SQL_IS_LINK_UP())) {
                                // Title decoration enabled?
-                               if ((getConfig('enable_title_deco') == "Y") && (getConfig('title_left') != "")) $TITLE .= trim(getConfig('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)) {
+                               if (isExtraTitleSet()) {
                                        // Then prepent it
-                                       $TITLE .= $EXTRA_TITLE." by ";
+                                       $TITLE .= getExtraTitle() . ' by ';
                                } // END - if
 
                                // Add 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']);
+                               if ((getConfig('enable_mod_title') == 'Y') || ((!isWhatSet()) && (!isActionSet())) || (getModule() == 'admin')) {
+                                       $TITLE .= " ".trim(getConfig('title_middle'))." ".getModuleTitle(getModule());
+                               } // END - if
 
                                // Add title from what file
-                               $MODE = "";
-                               if ($GLOBALS['module'] == "login") $MODE = "member";
-                                elseif ($GLOBALS['module'] == "index") $MODE = "guest";
-                               if ((!empty($MODE)) && (getConfig('enable_what_title') == "Y")) $TITLE .= " ".trim(getConfig('title_middle'))." ".GET_MOD_DESCR($MODE, $GLOBALS['what']);
+                               $mode = '';
+                               if (getModule() == 'login') $mode = 'member';
+                               elseif (getModule() == 'index') $mode = 'guest';
+                               if ((!empty($mode)) && (getConfig('enable_what_title') == 'Y')) $TITLE .= " ".trim(getConfig('title_middle'))." ".getModuleDescription($mode, getWhat());
 
                                // Add title decorations? (right)
-                               if ((getConfig('enable_title_deco') == "Y") && (getConfig('title_right') != "")) $TITLE .= " ".trim(getConfig('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', $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,40 +102,36 @@ 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") {
+               // Include meta data in 'guest' module
+               if (getModule() == 'index') {
                        // Load meta data template
-                       LOAD_TEMPLATE("metadata");
+                       LOAD_TEMPLATE('metadata');
 
                        // Add meta description to header
                        if ((isInstalled()) && (isAdminRegistered()) && (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']);
+                               generateMetaDescriptionCode(getModule(), getWhat());
                        } // END - if
                } // END - if
 
                // Include more header data here
-               LOAD_TEMPLATE("header");
+               LOAD_TEMPLATE('header');
 
                // Include stylesheet
-               LOAD_INC_ONCE("inc/stylesheet.php");
+               loadIncludeOnce('inc/stylesheet.php');
        } // END - if
 
        // Closing HEAD tag
-       if ($GLOBALS['output_mode'] != "1") OUTPUT_HTML("</head>");
-       $GLOBALS['header_sent'] = 1;
+       if (getOutputMode() != '1') OUTPUT_HTML('</head>');
+       if ($GLOBALS['header_sent'] == 0) $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")) {
-       // 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")) {
-               // 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
 
 //