X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Ffooter.php;h=d15df15b895d3cd4e21e420cf6b97f6cc4fed592;hb=5d0d05a99b39c75b54cd6b02c6093cf71532cd83;hp=e2d31c6e6d9d3f2c32375c71ea804043cf53b0c1;hpb=397eb5dee2611cfaa1ff494d73e6785b88109cd6;p=mailer.git

diff --git a/inc/footer.php b/inc/footer.php
index e2d31c6e6d..d15df15b89 100644
--- a/inc/footer.php
+++ b/inc/footer.php
@@ -32,8 +32,6 @@
  ************************************************************************/
 
 // Global variable stuff
-global $link, $frame, $CSS, $header, $footer;
-
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
@@ -41,7 +39,8 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Footer disabled or already sent?
-if (($footer != "1") && ($footer != "2") && ($CSS != "1")) {
+// 1234      5                       54    45                              5    5                              543    3                              321
+if ((((!isset($GLOBALS['footer_sent'])) || (($GLOBALS['footer_sent'] != "1") && ($GLOBALS['footer_sent'] != "2"))) && ($GLOBALS['output_mode'] != "1"))) {
 	// Output the generated HTML code or do nothing in direct-mode
 	if (getTotalFatalErrors() > 0) {
 		// Output fatal error messages
@@ -49,7 +48,7 @@ if (($footer != "1") && ($footer != "2") && ($CSS != "1")) {
 	} // END - if
 
 	// Shall we display the copyright notice?
-	if ((empty($frame)) && (empty($_GET['frame'])) && (basename($_SERVER['PHP_SELF']) != "mailid_top.php") && (isBooleanConstantAndTrue('WRITE_FOOTER')) && ($header == "2")) {
+	if ((!REQUEST_ISSET_GET(('frame'))) && (basename($_SERVER['PHP_SELF']) != "mailid_top.php") && (isBooleanConstantAndTrue('WRITE_FOOTER')) && ($GLOBALS['header_sent'] == "2")) {
 		// Backlink enabled?
 		if (isBooleanConstantAndTrue('ENABLE_BACKLINK')) {
 			// Copyright with backlink, thanks! :-)
@@ -61,7 +60,7 @@ if (($footer != "1") && ($footer != "2") && ($CSS != "1")) {
 	} // END - if
 
 	// Shall we display the parsing time and number of queries?
-	if ((getConfig('show_timings') == "Y") && (empty($_GET['frame'])) && ($header == "2")) {
+	if ((getConfig('show_timings') == "Y") && (!REQUEST_ISSET_GET(('frame'))) && ($GLOBALS['header_sent'] == "2")) {
 		// Then display it here
 		DISPLAY_PARSING_TIME_FOOTER();
 	} // END - if
@@ -74,7 +73,7 @@ if (($footer != "1") && ($footer != "2") && ($CSS != "1")) {
 } // END - if
 
 // Footer has been reached
-$footer = 1;
+$GLOBALS['footer_sent'] = 1;
 
 // Output HTML code
 OUTPUT_HTML("");