X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fheader.php;h=fe18f73c4e5add995bac2de8534de4b4f3f6009f;hb=3c2f106c02f6d86a90f529a0564abcbbe716fe71;hp=cbb11da08d791b7b3fb2cd9f49e43502d50d6537;hpb=43885129ac24cee5545a8a5ad51e90aa182fdf46;p=mailer.git

diff --git a/inc/header.php b/inc/header.php
index cbb11da08d..fe18f73c4e 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);
 			}
 		}
 
@@ -94,13 +104,15 @@ 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_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