X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fheader.php;h=1cd75b12c390618e3aecb4a26ef8a799867294f9;hb=d005c37ef992007d9ccad4acb9e0ce15ee6a9c9a;hp=b04464c288b41d04cecd8a1d69f84c2685bae5d1;hpb=397eb5dee2611cfaa1ff494d73e6785b88109cd6;p=mailer.git

diff --git a/inc/header.php b/inc/header.php
index b04464c288..1cd75b12c3 100644
--- a/inc/header.php
+++ b/inc/header.php
@@ -12,7 +12,12 @@
  * Kurzbeschreibung  : Gibt nur dann HTML-Code fuer den Kopf-Bereich    *
  *           aus, wenn Frameset nicht aktiv ist                         *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision:: 856                                                    $ *
+ * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009)              $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author:: stelzi                                                   $ *
+ * 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                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -39,19 +44,17 @@ if (!defined('__SECURITY')) {
 	require($INC);
 }
 
-global $header;
-
 // Is the header already sent?
-if (($header != "1") && ($header != "2")) {
+if (($GLOBALS['header_sent'] != "1") && ($GLOBALS['header_sent'] != "2")) {
 	// If not in CSS mode generate the header
-	if (($CSS != "1")) {
+	if (($GLOBALS['output_mode'] != "1")) {
 		// Generate header
 		$TITLE = "";
 
 		// 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 ((isConfigLoaded()) && (SQL_IS_LINK_UP())) {
 				// Title decoration enabled?
 				if ((getConfig('enable_title_deco') == "Y") && (getConfig('title_left') != "")) $TITLE .= trim(getConfig('title_left'))." ";
 
@@ -62,7 +65,7 @@ if (($header != "1") && ($header != "2")) {
 				} // END - if
 
 				// Add main title
-				$TITLE .= MAIN_TITLE;
+				$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'))." ".ADD_MODULE_TITLE($GLOBALS['module']);
@@ -77,22 +80,16 @@ if (($header != "1") && ($header != "2")) {
 				if ((getConfig('enable_title_deco') == "Y") && (getConfig('title_right') != "")) $TITLE .= " ".trim(getConfig('title_right'));
 
 				// Remember title in constant for the template
-				define('__PAGE_TITLE', html_entity_decode($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);
-
+				define('__PAGE_TITLE', $TITLE);
+			} 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
 
@@ -108,7 +105,7 @@ if (($header != "1") && ($header != "2")) {
 			LOAD_TEMPLATE("metadata");
 
 			// Add meta description to header
-			if ((isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('admin_registered')) && (isset($db)) && (is_resource($link))) {
+			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
@@ -122,17 +119,17 @@ if (($header != "1") && ($header != "2")) {
 	} // END - if
 
 	// Closing HEAD tag
-	if ($CSS != "1") OUTPUT_HTML("</head>");
-	$header = 1;
+	if ($GLOBALS['output_mode'] != "1") OUTPUT_HTML("</head>");
+	$GLOBALS['header_sent'] = 1;
 } // END - if
 
 // Load body or not
-if (($GLOBALS['module'] != "frametester") || (($GLOBALS['module'] == "frametester") && (isset($_GET['frame']))) || (($header == "1") && (!empty($_GET['frame']))) && ($CSS != "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 (($header == "1") && (basename($_SERVER['PHP_SELF']) != "mailid.php") && ($CSS != "1")) {
+	if (($GLOBALS['header_sent'] == "1") && (basename($_SERVER['PHP_SELF']) != "mailid.php") && ($GLOBALS['output_mode'] != "1")) {
 		// Add BODY tag
 		LOAD_TEMPLATE("page_body");
-		$header = 2;
+		$GLOBALS['header_sent'] = 2;
 	} // END - if
 } // END - if