X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fheader.php;h=261f49b4ef1318c0192fe0d1cd3daa73d8656cd8;hb=d1ca15cbf3bbbf1281a24fdf204aa5a9bae80e0f;hp=3ea5b4acfbc8529cb3d6adb484d65981fd8234e3;hpb=a975001c8e332a6af3513ea57e9acebeaadf1640;p=mailer.git

diff --git a/inc/header.php b/inc/header.php
index 3ea5b4acfb..261f49b4ef 100644
--- a/inc/header.php
+++ b/inc/header.php
@@ -41,64 +41,14 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
-}
+} // END - if
 
 // Is the header already sent?
-if (($GLOBALS['header_sent'] != '1') && ($GLOBALS['header_sent'] != '2')) {
+if (($GLOBALS['header_sent'] != 1) && ($GLOBALS['header_sent'] != 2)) {
 	// If not in CSS mode generate the header
-	if (getOutputMode() != '1') {
-		// Config and database connection valid?
-		if ((isConfigLocalLoaded()) && (isConfigLoaded()) && (SQL_IS_LINK_UP()) && (isExtensionActive('sql_patches'))) {
-			// Init title
-			$TITLE = '';
-
-			// Title decoration enabled?
-			if ((getConfig('enable_title_deco') == 'Y') && (getConfig('title_left') != '')) $TITLE .= trim(getConfig('title_left'))." ";
-
-			// Do we have some extra title?
-			if (isExtraTitleSet()) {
-				// Then prepent it
-				$TITLE .= getExtraTitle() . ' by ';
-			} // END - if
-
-			// Add main title
-			$TITLE .= getConfig('MAIN_TITLE');
-
-			// Add title of module? (middle decoration will also be added!)
-			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 (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'));
-
-			// Remember title in constant for the template
-			$content['header_title'] = $TITLE;
-		} elseif ((isInstalled()) && (isAdminRegistered())) {
-			// Installed, admin registered but no ext-sql_patches
-			$content['header_title'] = '[-- ' . getConfig('MAIN_TITLE').' - '.getModuleTitle(getModule()) . ' --]';
-		} elseif ((isInstalled()) && (!isAdminRegistered())) {
-			// Installed but no admin registered
-			$content['header_title'] = sprintf(getMessage('SETUP_OF_MXCHANGE'), getConfig('MAIN_TITLE'));
-		} elseif ((!isInstalled()) || (!isAdminRegistered())) {
-			// Installation mode
-			$content['header_title'] = getMessage('INSTALLATION_OF_MXCHANGE');
-		} else {
-			// Configuration not found!
-			$content['header_title'] = getMessage('NO_CONFIG_FOUND_TITLE');
-
-			// Do not add the fatal message in installation mode
-			if ((!isInstalling()) && (!isConfigLoaded())) addFatalMessage(__FILE__, __LINE__, getMessage('NO_CONFIG_FOUND'));
-		}
-
-		// Save some little memory
-		unset($TITLE);
+	if (getOutputMode() != 1) {
+		// Determine the page title
+		$content['header_title'] = determinePageTitle();
 
 		// Output page header code
 		loadTemplate('page_header', false, $content);
@@ -123,12 +73,12 @@ if (($GLOBALS['header_sent'] != '1') && ($GLOBALS['header_sent'] != '2')) {
 	} // END - if
 
 	// Closing HEAD tag
-	if (getOutputMode() != '1') outputHtml('</head>');
+	if (getOutputMode() != 1) outputHtml('</head>');
 	if ($GLOBALS['header_sent'] == 0) $GLOBALS['header_sent'] = 1;
 } // END - if
 
 // Add BODY tag or not?
-if ((getOutputMode() != '1') && ($GLOBALS['header_sent'] == 1) && ((getModule() != 'frametester') || (isGetRequestElementSet('frame')))) {
+if ((getOutputMode() != 1) && (getOutputMode() != -1) && ($GLOBALS['header_sent'] == 1) && ((getModule() != 'frametester') || (isGetRequestElementSet('frame')))) {
 	loadTemplate('page_body');
 	$GLOBALS['header_sent'] = 2;
 } // END - if