X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fheader.php;h=0a49ef8dfe37a6e8bc197f9f78cd763c2b20f1a1;hp=650dce7dddc31d60ba1a836acfaaa2eac9acda57;hb=5deec33be1baf2135eefc2bbb0d1b63c6cbd2f9a;hpb=5ae157f2010b3aae3c6f2ecdc6ec7c30b305be4a

diff --git a/inc/header.php b/inc/header.php
index 650dce7ddd..0a49ef8dfe 100644
--- a/inc/header.php
+++ b/inc/header.php
@@ -49,7 +49,7 @@ if (($GLOBALS['header_sent'] != "1") && ($GLOBALS['header_sent'] != "2")) {
 		// Add title decorations? (left)
 		if (!defined('__PAGE_TITLE')) {
 			// Config and database connection valid?
-			if ((isset($_CONFIG)) && (is_array($_CONFIG)) && (count($_CONFIG) > 1) && (SQL_IS_LINK_UP())) {
+			if ((isConfigLoaded()) && (SQL_IS_LINK_UP())) {
 				// Title decoration enabled?
 				if ((getConfig('enable_title_deco') == "Y") && (getConfig('title_left') != "")) $TITLE .= trim(getConfig('title_left'))." ";
 
@@ -76,21 +76,15 @@ if (($GLOBALS['header_sent'] != "1") && ($GLOBALS['header_sent'] != "2")) {
 
 				// Remember title in constant for the template
 				define('__PAGE_TITLE', $TITLE);
-			} elseif ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndTrue('admin_registered'))) {
-				// Load language file because it was missing in installation finalizer step... *sigh*
-				$FQFN = sprintf("inc/language/install_%s.php",
-					GET_LANGUAGE()
-				);
-				LOAD_INC_ONCE($FQFN);
-
+			} elseif ((!isInstalled()) || (!isAdminRegistered())) {
 				// Installation mode
-				define('__PAGE_TITLE', getMessage('INSTALLATION_OF_MXCHANGE'));
+				define('__PAGE_TITLE', sprintf(getMessage('INSTALLATION_OF_MXCHANGE'), constant('MAIN_TITLE')));
 			} else {
 				// Configuration not found!
 				define('__PAGE_TITLE', getMessage('NO_CONFIG_FOUND_TITLE'));
 
 				// Do not add the fatal message in installation mode
-				if (basename($_SERVER['PHP_SELF']) != "install.php") addFatalMessage(getMessage('NO_CONFIG_FOUND'));
+				if (basename($_SERVER['PHP_SELF']) != "install.php") addFatalMessage(__FILE__, __LINE__, getMessage('NO_CONFIG_FOUND'));
 			}
 		} // END - if
 
@@ -106,7 +100,7 @@ if (($GLOBALS['header_sent'] != "1") && ($GLOBALS['header_sent'] != "2")) {
 			LOAD_TEMPLATE("metadata");
 
 			// Add meta description to header
-			if ((isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('admin_registered')) && (SQL_IS_LINK_UP())) {
+			if ((isInstalled()) && (isAdminRegistered()) && (SQL_IS_LINK_UP())) {
 				// Add meta description not in admin and login module and when the script is installed
 				META_DESCRIPTION($GLOBALS['module'], $GLOBALS['what']);
 			} // END - if
@@ -125,7 +119,7 @@ if (($GLOBALS['header_sent'] != "1") && ($GLOBALS['header_sent'] != "2")) {
 } // END - if
 
 // Load body or not
-if (($GLOBALS['module'] != "frametester") || (($GLOBALS['module'] == "frametester") && (isset($_GET['frame']))) || (($GLOBALS['header_sent'] == "1") && (!empty($_GET['frame']))) && ($GLOBALS['output_mode'] != "1")) {
+if (($GLOBALS['module'] != "frametester") || (($GLOBALS['module'] == "frametester") && (REQUEST_ISSET_GET(('frame')))) || (($GLOBALS['header_sent'] == "1") && (REQUEST_ISSET_GET(('frame')))) && ($GLOBALS['output_mode'] != "1")) {
 	// Is the header sent and the script is not the mail confirmation script and not a CSS?
 	if (($GLOBALS['header_sent'] == "1") && (basename($_SERVER['PHP_SELF']) != "mailid.php") && ($GLOBALS['output_mode'] != "1")) {
 		// Add BODY tag