X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fheader.php;h=fe18f73c4e5add995bac2de8534de4b4f3f6009f;hp=59a2f5b24d1ee90d9c245ba8596c8db1da616810;hb=dfaa8c1675da4071ea451406a6f6fedd4c568416;hpb=94105795f6c6195c2630c09303c0aeb4ffbe15de

diff --git a/inc/header.php b/inc/header.php
index 59a2f5b24d..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);
 }
@@ -49,37 +49,53 @@ if (($header != "1") && ($header != "2")) {
 		$TITLE = "";
 
 		// Add title decorations? (left)
-		if ((count($CONFIG) > 1) && (is_resource($link)) && ($db) !== false) {
-			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']);
-
-			// 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']);
-
-			// Add title decorations? (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));
-		} elseif ((!mxchange_installed) || (!admin_registered)) {
-			// Load language file because it was missing in installation finalizer step... *sigh*
-			require_once(sprintf("%sinc/language/install_%s.php",
-				PATH,
-				GET_LANGUAGE()
-			));
-
-			// Installation mode
-			define('__PAGE_TITLE', INSTALLATION_OF_MXCHANGE);
-		} else {
-			// Configuration not found!
-			define('__PAGE_TITLE', NO_CONFIG_FOUND_TITLE);
-			ADD_FATAL(NO_CONFIG_FOUND);
+		if (!defined('__PAGE_TITLE')) {
+			// 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!)
+				if (isset($_CONFIG['enable_mod_title'])) {
+					if (($_CONFIG['enable_mod_title'] == "Y") || ((empty($GLOBALS['what'])) && (empty($GLOBALS['action']))) || ($GLOBALS['module'] == "admin")) $TITLE .= " ".trim($_CONFIG['title_middle'])." ".ADD_MODULE_TITLE($GLOBALS['module']);
+				} // END - if
+
+				// Add title from what file
+				$MODE = "";
+				if ($GLOBALS['module'] == "login") $MODE = "member";
+				 elseif ($GLOBALS['module'] == "index") $MODE = "guest";
+				if ((!empty($MODE)) && (isset($_CONFIG['enable_what_title'])) && ($_CONFIG['enable_what_title'] == "Y")) $TITLE .= " ".trim($_CONFIG['title_middle'])." ".GET_MOD_DESCR($MODE, $GLOBALS['what']);
+
+				// Add title decorations? (right)
+				if (($_CONFIG['enable_title_deco'] == "Y") && (!empty($_CONFIG['title_right']))) $TITLE .= " ".trim($_CONFIG['title_right']);
+
+				// Remember title in constant for the template
+				define('__PAGE_TITLE', html_entity_decode($TITLE));
+			} elseif ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndTrue('admin_registered'))) {
+				// Load language file because it was missing in installation finalizer step... *sigh*
+				require_once(sprintf("%sinc/language/install_%s.php",
+					PATH,
+					GET_LANGUAGE()
+				));
+
+				// Installation mode
+				define('__PAGE_TITLE', INSTALLATION_OF_MXCHANGE);
+			} else {
+				// Configuration not found!
+				define('__PAGE_TITLE', NO_CONFIG_FOUND_TITLE);
+
+				// Do not add the fatal message in installation mode
+				if (basename($_SERVER['PHP_SELF']) != "install.php") ADD_FATAL(NO_CONFIG_FOUND);
+			}
 		}
 
 		// Save some little memory
@@ -88,39 +104,38 @@ 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 ((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']);
-		}
+			// 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>");
+	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
 
 //
 ?>