X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fheader.php;h=a5462b7495c6edd5efe57d48f7d3c76fb168bd4d;hb=2f7ccb30d9251afcf733d840e48d6ac2317a9f6c;hp=7c2f8534ac034d3963630768e5f6d2fcb055c56a;hpb=21838d582d767f65941fec8155cb038fe6332103;p=mailer.git

diff --git a/inc/header.php b/inc/header.php
index 7c2f8534ac..a5462b7495 100644
--- a/inc/header.php
+++ b/inc/header.php
@@ -50,25 +50,27 @@ if (($header != "1") && ($header != "2")) {
 
 		// Add title decorations? (left)
 		if (!defined('__PAGE_TITLE')) {
-			if ((count($_CONFIG) > 1) && (is_resource($link)) && (!is_resource($db))) {
-				if (($_CONFIG['title_decoration'] == 'Y') && (trim(!empty($_CONFIG['title_left'])))) $TITLE .= trim($_CONFIG['title_left'])." ";
+			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'])." ";
 				$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));
-			} elseif ((!mxchange_installed) || (!admin_registered)) {
+			} 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,
@@ -80,7 +82,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['SELF']) != "install.php") ADD_FATAL(NO_CONFIG_FOUND);
 			}
 		}
 
@@ -94,7 +98,7 @@ if (($header != "1") && ($header != "2")) {
 		LOAD_TEMPLATE("metadata");
 
 		// Add meta description to header
-		if ((mxchange_installed) && (admin_registered) && ($GLOBALS['module'] != "admin") && ($GLOBALS['module'] != "login") && (isset($db)) && (isset($link))) {
+		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']);
 		}