X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fheader.php;h=cbb11da08d791b7b3fb2cd9f49e43502d50d6537;hb=7b8e99bea1bd896d7d984bb5a04fdbf974890a7c;hp=2107e845a1507c273a9cc60561950011fcdd8988;hpb=c3822adad779fbfc5650f2a50880765375578200;p=mailer.git

diff --git a/inc/header.php b/inc/header.php
index 2107e845a1..cbb11da08d 100644
--- a/inc/header.php
+++ b/inc/header.php
@@ -101,32 +101,29 @@ if (($header != "1") && ($header != "2")) {
 		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']);
-		}
+		} // END - if
 
 		// Include more header data here
 		LOAD_TEMPLATE("header");
 
 		// Include stylesheet
 		include (PATH."inc/stylesheet.php");
-	}
+	} // END - if
 
 	// Closing HEAD tag
 	if ($CSS != "1") OUTPUT_HTML("</head>");
 	$header = 1;
-}
-
-// Set unsetted variables
-if (empty($_GET['frame'])) $_GET['frame'] = "";
+} // END - if
 
 // Load body or not
-if ((($GLOBALS['module'] != "frametester")) || (($header == "1") && ($GLOBALS['module'] == "frametester") && (!empty($_GET['frame']))) && ($CSS != "1")) {
+if (((!$isFrameset) && ($GLOBALS['module'] != "frametester")) || (($GLOBALS['module'] == "frametester") && (isset($_GET['frame']))) || (($header == "1") && ($isFrameset) && (!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
 		LOAD_TEMPLATE("page_body");
-  		$header = 2;
-  	}
-}
+		$header = 2;
+	} // END - if
+} // END - if
 
 //
 ?>