X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fheader.php;h=aa10f9daed701f9be923f9ea6c5b0b46976067d9;hp=bd4c3e3075fe9c6bd8e311130f07cbceeb91dd36;hb=f928ad2bed60fa256d0641eaf6d2c027a2944688;hpb=0437f06b273f885db05736449a952c6eb72086ca

diff --git a/inc/header.php b/inc/header.php
index bd4c3e3075..aa10f9daed 100644
--- a/inc/header.php
+++ b/inc/header.php
@@ -47,7 +47,7 @@ if (!defined('__SECURITY')) {
 // Is the header already sent?
 if (($GLOBALS['header_sent'] != '1') && ($GLOBALS['header_sent'] != '2')) {
 	// If not in CSS mode generate the header
-	if (($GLOBALS['output_mode'] != '1')) {
+	if ((getOutputMode() != '1')) {
 		// Generate header
 		$TITLE = '';
 
@@ -68,13 +68,15 @@ if (($GLOBALS['header_sent'] != '1') && ($GLOBALS['header_sent'] != '2')) {
 				$TITLE .= constant('MAIN_TITLE');
 
 				// Add title of module? (middle decoration will also be added!)
-				if ((getConfig('enable_mod_title') == 'Y') || ((empty($GLOBALS['what'])) && (empty($GLOBALS['action']))) || ($GLOBALS['module'] == 'admin')) $TITLE .= " ".trim(getConfig('title_middle'))." ".getModuleTitle($GLOBALS['module']);
+				if ((getConfig('enable_mod_title') == 'Y') || ((!isWhatSet()) && (!isActionSet())) || (getModule() == 'admin')) {
+					$TITLE .= " ".trim(getConfig('title_middle'))." ".getModuleTitle(getModule());
+				} // END - if
 
 				// Add title from what file
 				$mode = '';
-				if ($GLOBALS['module'] == "login") $mode = 'member';
-				 elseif ($GLOBALS['module'] == 'index') $mode = 'guest';
-				if ((!empty($mode)) && (getConfig('enable_what_title') == 'Y')) $TITLE .= " ".trim(getConfig('title_middle'))." ".getModuleDescription($mode, $GLOBALS['what']);
+				if (getModule() == 'login') $mode = 'member';
+				elseif (getModule() == 'index') $mode = 'guest';
+				if ((!empty($mode)) && (getConfig('enable_what_title') == 'Y')) $TITLE .= " ".trim(getConfig('title_middle'))." ".getModuleDescription($mode, getWhat());
 
 				// Add title decorations? (right)
 				if ((getConfig('enable_title_deco') == 'Y') && (getConfig('title_right') != '')) $TITLE .= " ".trim(getConfig('title_right'));
@@ -103,14 +105,14 @@ if (($GLOBALS['header_sent'] != '1') && ($GLOBALS['header_sent'] != '2')) {
 		LOAD_TEMPLATE('page_header');
 
 		// Include meta data in 'guest' module
-		if ($GLOBALS['module'] == 'index') {
+		if (getModule() == 'index') {
 			// Load meta data template
 			LOAD_TEMPLATE('metadata');
 
 			// Add meta description to header
 			if ((isInstalled()) && (isAdminRegistered()) && (SQL_IS_LINK_UP())) {
 				// Add meta description not in admin and login module and when the script is installed
-				generateMetaDescriptionCode($GLOBALS['module'], $GLOBALS['what']);
+				generateMetaDescriptionCode(getModule(), getWhat());
 			} // END - if
 		} // END - if
 
@@ -122,18 +124,14 @@ if (($GLOBALS['header_sent'] != '1') && ($GLOBALS['header_sent'] != '2')) {
 	} // END - if
 
 	// Closing HEAD tag
-	if ($GLOBALS['output_mode'] != '1') OUTPUT_HTML('</head>');
-	$GLOBALS['header_sent'] = 1;
+	if (getOutputMode() != '1') OUTPUT_HTML('</head>');
+	if ($GLOBALS['header_sent'] == 0) $GLOBALS['header_sent'] = 1;
 } // END - if
 
-// Load body or not
-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
-		LOAD_TEMPLATE('page_body');
-		$GLOBALS['header_sent'] = 2;
-	} // END - if
+// Add BODY tag or not?
+if ((getOutputMode() != '1') && ($GLOBALS['header_sent'] == 1)) {
+	LOAD_TEMPLATE('page_body');
+	$GLOBALS['header_sent'] = 2;
 } // END - if
 
 //