X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fheader.php;h=b6d3f52b6e27f0ccb8a58b28e74e96a000b5c4d7;hp=2107e845a1507c273a9cc60561950011fcdd8988;hb=d0c792100bf4b67acd1824860204929c1540f6fb;hpb=c3822adad779fbfc5650f2a50880765375578200

diff --git a/inc/header.php b/inc/header.php
index 2107e845a1..b6d3f52b6e 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,9 +94,9 @@ 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);
 			}
-		}
+		} // END - if
 
 		// Save some little memory
 		unset($TITLE);
@@ -94,39 +104,39 @@ 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");
-	}
+	} // END - if
 
 	// Closing HEAD tag
 	if ($CSS != "1") OUTPUT_HTML("</head>");
 	$header = 1;
-}
-
-// Set unsetted variables
-if (empty($_GET['frame'])) $_GET['frame'] = "";
+} // 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
 		LOAD_TEMPLATE("page_body");
-  		$header = 2;
-  	}
-}
+		$header = 2;
+	} // END - if
+} // END - if
 
 //
 ?>