minor SQL rewrites

[mailer.git] / inc / header.php

diff --git a/inc/header.php b/inc/header.php
index 015b9e43b358b39e8f48b630b5189013185a5dd6..dee383f81f02d002d3444f3ea09a2238bfabef7e 100644 (file)
--- a/inc/header.php
+++ b/inc/header.php
@@ -39,32 +39,32 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
        require($INC);
 }
 
-if (defined('frameset_active')) {
-       // Initialize variables
-       $header = ""; $FOOTER = "";
-       if (empty($GLOBALS['what'])) $GLOBALS['what'] = "";
-       if (($header != "1") && ($header != "2")) {
-               // If not in CSS mode generate the header
-               if (($CSS != "1")) {
-                       // Generate header
-                       $TITLE = "";
-
-                       // Add title decorations? (left)
-                       if ((!empty($CONFIG)) && (isset($link)) && (isset($db))) {
-                               if (($CONFIG['title_decoration'] == 'Y') && (trim(!empty($CONFIG['title_left'])))) $TITLE .= trim($CONFIG['title_left'])." ";
+// Initialize variables
+if (!isset($header)) $header = 0;
+
+if (($header != "1") && ($header != "2")) {
+       // If not in CSS mode generate the header
+       if (($CSS != "1")) {
+               // Generate header
+               $TITLE = "";
+
+               // Add title decorations? (left)
+               if (!defined('__PAGE_TITLE')) {
+                       if ((count($_CONFIG) > 1) && (is_resource($link)) && (isset($db))) {
+                               if (($_CONFIG['title_decoration'] == 'Y') && (trim(!empty($_CONFIG['title_left'])))) $TITLE .= trim($_CONFIG['title_left'])." ";
                                $TITLE .= MAIN_TITLE;
 
                                // Add title of module? (middle decoration will also be added!)
-                               if (($CONFIG['title_mod_show'] == 'Y') || ((empty($GLOBALS['what'])) && (empty($GLOBALS['action']))) || ($GLOBALS['module'] == "admin")) $TITLE .= " ".trim($CONFIG['title_middle'])." ".ADD_MODULE_TITLE($GLOBALS['module']);
+                               if (($_CONFIG['title_mod_show'] == 'Y') || ((empty($GLOBALS['what'])) && (empty($GLOBALS['action']))) || ($GLOBALS['module'] == "admin")) $TITLE .= " ".trim($_CONFIG['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)) && ($CONFIG['title_what_show'] == 'Y')) $TITLE .= " ".trim($CONFIG['title_middle'])." ".GET_MOD_DESCR($MODE, $GLOBALS['what']);
+                               if ((!empty($MODE)) && (isset($_CONFIG['title_what_show'])) && ($_CONFIG['title_what_show'] == 'Y')) $TITLE .= " ".trim($_CONFIG['title_middle'])." ".GET_MOD_DESCR($MODE, $GLOBALS['what']);
 
                                // Add title decorations? (right)
-                               if (($CONFIG['title_decoration'] == 'Y') && (!empty($CONFIG['title_right']))) $TITLE .= " ".trim($CONFIG['title_right']);
+                               if (($_CONFIG['title_decoration'] == 'Y') && (!empty($_CONFIG['title_right']))) $TITLE .= " ".trim($_CONFIG['title_right']);
 
                                // Remember title in constant for the template
                                define('__PAGE_TITLE', html_entity_decode($TITLE));
@@ -82,49 +82,47 @@ if (defined('frameset_active')) {
                                define('__PAGE_TITLE', NO_CONFIG_FOUND_TITLE);
                                ADD_FATAL(NO_CONFIG_FOUND);
                        }
+               }
 
-                       // Save some little memory
-                       unset($TITLE);
-
-                       // Output page header code
-                       LOAD_TEMPLATE("page_header");
+               // Save some little memory
+               unset($TITLE);
 
-                       // Include meta data here
-                       LOAD_TEMPLATE("metadata");
+               // Output page header code
+               LOAD_TEMPLATE("page_header");
 
-                       // Add meta description to header
-                       if ((mxchange_installed) && (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']);
-                       }
+               // Include meta data here
+               LOAD_TEMPLATE("metadata");
 
-                       // Include more header data here
-                       LOAD_TEMPLATE("header");
-
-                       // Include stylesheet
-                       include (PATH."inc/stylesheet.php");
+               // Add meta description to header
+               if ((mxchange_installed) && (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']);
                }
 
-               // Closing HEAD tag
-               if ($CSS != "1") OUTPUT_HTML("</HEAD>\n");
-               $header = 1;
-       }
+               // Include more header data here
+               LOAD_TEMPLATE("header");
 
-       // Set unsetted variables
-       if (empty($_GET['frame'])) $_GET['frame'] = "";
-
-       // Load body or not
-       if (((!frameset_active) && ($GLOBALS['module'] != "frametester")) || (($header == "1") && ($GLOBALS['module'] == "frametester") && (!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
-                       LOAD_TEMPLATE("page_body");
-                       $header = 2;
-               }
+               // Include stylesheet
+               include (PATH."inc/stylesheet.php");
        }
-} else {
-       // Something is missing
-       die ("<STRONG>Fatal error:</STRONG> You have to define <STRONG>frameset_active</STRONG>!");
+
+       // Closing HEAD tag
+       if ($CSS != "1") OUTPUT_HTML("</HEAD>");
+       $header = 1;
+}
+
+// Set unsetted variables
+if (empty($_GET['frame'])) $_GET['frame'] = "";
+
+// Load body or not
+if ((($GLOBALS['module'] != "frametester")) || (($header == "1") && ($GLOBALS['module'] == "frametester") && (!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
+               LOAD_TEMPLATE("page_body");
+               $header = 2;
+       }
 }
+
 //
 ?>