X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fheader.php;h=b510202cc6834f0c3e255cf16d49faedcbe31a9a;hb=ae64f8d8d403a8e4990f484d14aad36722e1da51;hp=1031590a81c4746f0a56a7933c295454fb0541d8;hpb=e6e3183f794b385f5acc38b371c220cc35cdac38;p=mailer.git

diff --git a/inc/header.php b/inc/header.php
index 1031590a81..b510202cc6 100644
--- a/inc/header.php
+++ b/inc/header.php
@@ -53,7 +53,7 @@ if (($header != "1") && ($header != "2")) {
 			// Config and database connection valid?
 			if ((isset($_CONFIG)) && (is_array($_CONFIG)) && (count($_CONFIG) > 1) && (is_resource($link)) && (isset($db))) {
 				// Title decoration enabled?
-				if (($_CONFIG['enable_title_deco'] == "Y") && (!empty($_CONFIG['title_left']))) $TITLE .= trim($_CONFIG['title_left'])." ";
+				if ((getConfig('enable_title_deco') == "Y") && (getConfig('title_left') != "")) $TITLE .= trim(getConfig('title_left'))." ";
 
 				// Do we have some extra title?
 				if (!empty($EXTRA_TITLE)) {
@@ -65,22 +65,20 @@ if (($header != "1") && ($header != "2")) {
 				$TITLE .= MAIN_TITLE;
 
 				// Add title of module? (middle decoration will also be added!)
-				if (isset($_CONFIG['enable_mod_title'])) {
-					if (($_CONFIG['enable_mod_title'] == "Y") || ((empty($GLOBALS['what'])) && (empty($GLOBALS['action']))) || ($GLOBALS['module'] == "admin")) $TITLE .= " ".trim($_CONFIG['title_middle'])." ".ADD_MODULE_TITLE($GLOBALS['module']);
-				} // END - if
+				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']);
 
 				// Add title from what file
 				$MODE = "";
 				if ($GLOBALS['module'] == "login") $MODE = "member";
 				 elseif ($GLOBALS['module'] == "index") $MODE = "guest";
-				if ((!empty($MODE)) && (isset($_CONFIG['enable_what_title'])) && ($_CONFIG['enable_what_title'] == "Y")) $TITLE .= " ".trim($_CONFIG['title_middle'])." ".GET_MOD_DESCR($MODE, $GLOBALS['what']);
+				if ((!empty($MODE)) && (getConfig('enable_what_title') == "Y")) $TITLE .= " ".trim(getConfig('title_middle'))." ".GET_MOD_DESCR($MODE, $GLOBALS['what']);
 
 				// Add title decorations? (right)
-				if (($_CONFIG['enable_title_deco'] == "Y") && (!empty($_CONFIG['title_right']))) $TITLE .= " ".trim($_CONFIG['title_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', html_entity_decode($TITLE));
-			} elseif ((!defined('mxchange_installed')) || (!defined('admin_registered'))) {
+			} elseif ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndTrue('admin_registered'))) {
 				// Load language file because it was missing in installation finalizer step... *sigh*
 				require_once(sprintf("%sinc/language/install_%s.php",
 					PATH,
@@ -96,7 +94,7 @@ if (($header != "1") && ($header != "2")) {
 				// Do not add the fatal message in installation mode
 				if (basename($_SERVER['PHP_SELF']) != "install.php") ADD_FATAL(NO_CONFIG_FOUND);
 			}
-		}
+		} // END - if
 
 		// Save some little memory
 		unset($TITLE);
@@ -104,13 +102,16 @@ if (($header != "1") && ($header != "2")) {
 		// Output page header code
 		LOAD_TEMPLATE("page_header");
 
-		// Include meta data here
-		LOAD_TEMPLATE("metadata");
+		// Include meta data in "guest" module
+		if ($GLOBALS['module'] == "index") {
+			// Load meta data template
+			LOAD_TEMPLATE("metadata");
 
-		// Add meta description to header
-		if ((isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('admin_registered')) && ($GLOBALS['module'] != "admin") && ($GLOBALS['module'] != "login") && (isset($db)) && (isset($link))) {
-			// Add meta description not in admin and login module and when the script is installed
-			META_DESCRIPTION($GLOBALS['module'], $GLOBALS['what']);
+			// Add meta description to header
+			if ((isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('admin_registered')) && (isset($db)) && (is_resource($link))) {
+				// Add meta description not in admin and login module and when the script is installed
+				META_DESCRIPTION($GLOBALS['module'], $GLOBALS['what']);
+			} // END - if
 		} // END - if
 
 		// Include more header data here
@@ -126,7 +127,7 @@ if (($header != "1") && ($header != "2")) {
 } // END - if
 
 // Load body or not
-if (((!$isFrameset) && ($GLOBALS['module'] != "frametester")) || (($GLOBALS['module'] == "frametester") && (isset($_GET['frame']))) || (($header == "1") && ($isFrameset) && (!empty($_GET['frame']))) && ($CSS != "1")) {
+if (($GLOBALS['module'] != "frametester") || (($GLOBALS['module'] == "frametester") && (isset($_GET['frame']))) || (($header == "1") && (!empty($_GET['frame']))) && ($CSS != "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")) {
 		// Add BODY tag