Reset rewritten, SQL fixed, zeros are now numeric

[mailer.git] / inc / header.php

diff --git a/inc/header.php b/inc/header.php
index 3e31030b389e8eca7b318d9616b99d8b633d66ed..ce152eaad04333294e4453eb6674f5563558365b 100644 (file)
--- a/inc/header.php
+++ b/inc/header.php
@@ -50,8 +50,10 @@ if (($header != "1") && ($header != "2")) {
 
                // Add title decorations? (left)
                if (!defined('__PAGE_TITLE')) {
-                       if ((count($_CONFIG) > 1) && (is_resource($link)) && (isset($db))) {
-                               if (($_CONFIG['enable_title_deco'] == "Y") && (trim(!empty($_CONFIG['title_left'])))) $TITLE .= trim($_CONFIG['title_left'])." ";
+                       // 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'])." ";
                                $TITLE .= MAIN_TITLE;
 
                                // Add title of module? (middle decoration will also be added!)
@@ -84,7 +86,7 @@ if (($header != "1") && ($header != "2")) {
                                define('__PAGE_TITLE', NO_CONFIG_FOUND_TITLE);
 
                                // Do not add the fatal message in installation mode
-                               if (basename($_SERVER['SELF']) != "install.php") ADD_FATAL(NO_CONFIG_FOUND);
+                               if (basename($_SERVER['PHP_SELF']) != "install.php") ADD_FATAL(NO_CONFIG_FOUND);
                        }
                }
 
@@ -116,7 +118,7 @@ if (($header != "1") && ($header != "2")) {
 } // END - if
 
 // Load body or not
-if ((($GLOBALS['module'] != "frametester")) || (($header == "1") && ($GLOBALS['module'] == "frametester") && (!empty($_GET['frame']))) && ($CSS != "1")) {
+if (((!$isFrameset) && ($GLOBALS['module'] != "frametester")) || (($GLOBALS['module'] == "frametester") && (isset($_GET['frame']))) || (($header == "1") && ($isFrameset) && (!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