X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fheader.php;h=50eebd774255d3736a3b39342311559c3f5f3f4b;hp=dc81c5a8689222ff330f8bbd8101e26e76344858;hb=4430deea8d457245b0434b2b71570ad692dc7f6c;hpb=59bd8a9805c51c895a92cc12825f4cbdfd792597

diff --git a/inc/header.php b/inc/header.php
index dc81c5a868..50eebd7742 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) && (is_resource($link)) && (isset($db))) {
+			if ((isset($_CONFIG)) && (is_array($_CONFIG)) && (count($_CONFIG) > 1) && (SQL_IS_LINK_UP())) {
 				// Title decoration enabled?
 				if ((getConfig('enable_title_deco') == "Y") && (getConfig('title_left') != "")) $TITLE .= trim(getConfig('title_left'))." ";
 
@@ -78,10 +78,10 @@ if (($GLOBALS['header_sent'] != "1") && ($GLOBALS['header_sent'] != "2")) {
 				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",
+				$INC = sprintf("inc/language/install_%s.php",
 					GET_LANGUAGE()
 				);
-				LOAD_INC_ONCE($FQFN);
+				LOAD_INC_ONCE($INC);
 
 				// Installation mode
 				define('__PAGE_TITLE', getMessage('INSTALLATION_OF_MXCHANGE'));
@@ -106,7 +106,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')) && (isset($db)) && (is_resource($link))) {
+			if ((isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('admin_registered')) && (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 +125,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