X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffooter.php;h=ed888b44692142fedee53838353ebb1f3d0c7529;hb=23f39916099dad094d2d2b0fe54d335bddc986db;hp=85ebb5be438e37a5517ba945f8ed461532595638;hpb=121dafd40be4c4b3e41f37a943b86cf2cb48a224;p=mailer.git

diff --git a/inc/footer.php b/inc/footer.php
index 85ebb5be43..ed888b4469 100644
--- a/inc/footer.php
+++ b/inc/footer.php
@@ -35,31 +35,37 @@
 global $link, $frame, $CSS, $header;
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
+if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
-}
+} // END - if
+
+// @TODO Workaround for css.php
+if (!isset($footer)) $footer = 0;
 
 if (($footer != "1") && ($footer != "2") && ($CSS != "1")) {
 	// Output the generated HTML code or do nothing in direct-mode
 	if (!empty($FATAL[0])) {
 		// Output fatal error messages
 		require_once(PATH."inc/fatal_errors.php");
-	}
+	} // END - if
 
 	// Shall we display the copyright notice?
-	if ((empty($frame)) && (basename($_SERVER['PHP_SELF']) != "mailid_top.php") && ((isBooleanConstantAndTrue('WRITE_FOOTER ')))) {
+	if ((empty($frame)) && (empty($_GET['frame'])) && (basename($_SERVER['PHP_SELF']) != "mailid_top.php") && (isBooleanConstantAndTrue('WRITE_FOOTER')) && ($header == "2")) {
 		LOAD_TEMPLATE("copyright");
-	}
+	} // END - if
 
 	// Shall we display the parsing time and number of queries?
-	if ((isset($_CONFIG['show_timings'])) && ($_CONFIG['show_timings'] == "Y")) {
+	if ((isset($_CONFIG['show_timings'])) && ($_CONFIG['show_timings'] == "Y") && (empty($_GET['frame'])) && ($header == "2")) {
 		// Then display it here
 		DISPLAY_PARSING_TIME_FOOTER();
-	}
+	} // END - if
 
-	// Load page footer
-	LOAD_TEMPLATE("page_footer");
+	// Not in frameset mode?
+	if ((!isset($isFrameset)) || ($isFrameset === false)) {
+		// Load page footer
+		LOAD_TEMPLATE("page_footer");
+	} // END - if
 
 	// And the last closing HTML tag
 	OUTPUT_HTML("</HTML>");