X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fheader.php;h=b64cebb75e38e33240eca0ddff17c25d259a1e9d;hp=20500100af20751f4e6d4f6cacb22be1a6c2b721;hb=4db052cce49f60b6d9cc0f1c06b95cdd99f904ad;hpb=58b29a924c48e7c1ce38c435c92e541b53984c56

diff --git a/inc/header.php b/inc/header.php
index 20500100af..b64cebb75e 100644
--- a/inc/header.php
+++ b/inc/header.php
@@ -50,21 +50,33 @@ if (($header != "1") && ($header != "2")) {
 
 		// Add title decorations? (left)
 		if (!defined('__PAGE_TITLE')) {
-			if ((count($_CONFIG) > 1) && (is_resource($link)) && (isset($db))) {
-				if (($_CONFIG['title_decoration'] == '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!)
-				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']);
+				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['title_what_show'])) && ($_CONFIG['title_what_show'] == 'Y')) $TITLE .= " ".trim($_CONFIG['title_middle'])." ".GET_MOD_DESCR($MODE, $GLOBALS['what']);
+				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['title_decoration'] == 'Y') && (!empty($_CONFIG['title_right']))) $TITLE .= " ".trim($_CONFIG['title_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));
@@ -80,7 +92,9 @@ if (($header != "1") && ($header != "2")) {
 			} else {
 				// Configuration not found!
 				define('__PAGE_TITLE', NO_CONFIG_FOUND_TITLE);
-				ADD_FATAL(NO_CONFIG_FOUND);
+
+				// Do not add the fatal message in installation mode
+				if (basename($_SERVER['PHP_SELF']) != "install.php") ADD_FATAL(NO_CONFIG_FOUND);
 			}
 		}
 
@@ -97,32 +111,29 @@ if (($header != "1") && ($header != "2")) {
 		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']);
-		}
+		} // 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
 
 //
 ?>