X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Fheader.php;h=8f2d54deae8f6518ec0d94e4a5a4b05c0ce70e83;hb=7c17bd72303e885e649668422435fbb0956bb3a0;hp=3e31030b389e8eca7b318d9616b99d8b633d66ed;hpb=96fd2e894833814cc3fb12b0294146cf55941508;p=mailer.git

diff --git a/inc/header.php b/inc/header.php
index 3e31030b38..8f2d54deae 100644
--- a/inc/header.php
+++ b/inc/header.php
@@ -34,7 +34,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
+if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 }
@@ -50,8 +50,18 @@ 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'])." ";
+
+				// Do we have some extra title?
+				if (!empty($EXTRA_TITLE)) {
+					// Then prepent it
+					$TITLE .= $EXTRA_TITLE." by ";
+				} // END - if
+
+				// Add main title
 				$TITLE .= MAIN_TITLE;
 
 				// Add title of module? (middle decoration will also be added!)
@@ -84,7 +94,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 +126,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