X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fheader.php;h=06da594e4d73fb13348a091890ab0c79cfa5a232;hp=aa10f9daed701f9be923f9ea6c5b0b46976067d9;hb=6aa5b6c3d7c49ceb5a41b836657321e9c0b5dea5;hpb=49248176a5638be80b148ef55d0dc8c334522bf3

diff --git a/inc/header.php b/inc/header.php
index aa10f9daed..06da594e4d 100644
--- a/inc/header.php
+++ b/inc/header.php
@@ -19,7 +19,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -40,74 +40,73 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
+	die();
 }
 
 // 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')) {
-		// Generate header
-		$TITLE = '';
-
-		// Add title decorations? (left)
-		if (!defined('__PAGE_TITLE')) {
-			// Config and database connection valid?
-			if ((isConfigLocalLoaded()) && (isConfigLoaded()) && (SQL_IS_LINK_UP())) {
-				// 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 .= constant('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
-				define('__PAGE_TITLE', $TITLE);
-			} elseif ((isInstalled()) && (!isAdminRegistered())) {
-				// Installed but no admin registered
-				define('__PAGE_TITLE', sprintf(getMessage('SETUP_OF_MXCHANGE'), constant('MAIN_TITLE')));
-			} elseif ((!isInstalled()) || (!isAdminRegistered())) {
-				// Installation mode
-				define('__PAGE_TITLE', getMessage('INSTALLATION_OF_MXCHANGE'));
-			} else {
-				// Configuration not found!
-				define('__PAGE_TITLE', getMessage('NO_CONFIG_FOUND_TITLE'));
-
-				// Do not add the fatal message in installation mode
-				if (!isInstalling()) addFatalMessage(__FILE__, __LINE__, getMessage('NO_CONFIG_FOUND'));
-			}
-		} // END - if
+	if (getOutputMode() != 1) {
+		// Config and database connection valid?
+		if ((isConfigLocalLoaded()) && (isConfigurationLoaded()) && (SQL_IS_LINK_UP()) && (isExtensionInstalledAndNewer('sql_patches', '0.1.6'))) {
+			// 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()) && (!isConfigurationLoaded())) addFatalMessage(__FILE__, __LINE__, getMessage('NO_CONFIG_FOUND'));
+		}
 
 		// Save some little memory
 		unset($TITLE);
 
 		// Output page header code
-		LOAD_TEMPLATE('page_header');
+		loadTemplate('page_header', false, $content);
 
 		// Include meta data in 'guest' module
 		if (getModule() == 'index') {
 			// Load meta data template
-			LOAD_TEMPLATE('metadata');
+			loadTemplate('metadata');
 
 			// Add meta description to header
 			if ((isInstalled()) && (isAdminRegistered()) && (SQL_IS_LINK_UP())) {
@@ -117,22 +116,22 @@ if (($GLOBALS['header_sent'] != '1') && ($GLOBALS['header_sent'] != '2')) {
 		} // END - if
 
 		// Include more header data here
-		LOAD_TEMPLATE('header');
+		loadTemplate('header');
 
 		// Include stylesheet
 		loadIncludeOnce('inc/stylesheet.php');
 	} // END - if
 
 	// Closing HEAD tag
-	if (getOutputMode() != '1') OUTPUT_HTML('</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)) {
-	LOAD_TEMPLATE('page_body');
+if ((getOutputMode() != 1) && (getOutputMode() != -1) && ($GLOBALS['header_sent'] == 1) && ((getModule() != 'frametester') || (isGetRequestElementSet('frame')))) {
+	loadTemplate('page_body');
 	$GLOBALS['header_sent'] = 2;
 } // END - if
 
-//
+// [EOF]
 ?>