X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffooter.php;h=d15df15b895d3cd4e21e420cf6b97f6cc4fed592;hb=9e1f6d2cff0bbef912d605d4ae1728f0382b83a4;hp=6d4b63cdd2b18c47b4b7d9d6c4cb15cc64abec75;hpb=a53ef75a3f7b9a8fffdc4b4f453b78dfef2bcf3d;p=mailer.git

diff --git a/inc/footer.php b/inc/footer.php
index 6d4b63cdd2..d15df15b89 100644
--- a/inc/footer.php
+++ b/inc/footer.php
@@ -32,26 +32,23 @@
  ************************************************************************/
 
 // Global variable stuff
-global $link, $frame, $CSS, $header;
-
 // Some security stuff...
 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")) {
+// Footer disabled or already sent?
+// 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 (!empty($FATAL[0])) {
+	if (getTotalFatalErrors() > 0) {
 		// Output fatal error messages
-		require_once(PATH."inc/fatal_errors.php");
+		LOAD_INC_ONCE("inc/fatal_errors.php");
 	} // 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! :-)
@@ -63,40 +60,23 @@ if (($footer != "1") && ($footer != "2") && ($CSS != "1")) {
 	} // END - if
 
 	// Shall we display the parsing time and number of queries?
-	if ((isset($_CONFIG['show_timings'])) && ($_CONFIG['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
 
-	// Not in frameset mode?
-	if ((!isset($isFrameset)) || ($isFrameset === false)) {
-		// Load page footer
-		LOAD_TEMPLATE("page_footer");
-	} // END - if
+	// Load page footer
+	LOAD_TEMPLATE("page_footer");
 
 	// And the last closing HTML tag
-	OUTPUT_HTML("</HTML>");
-
-	// Footer has been reached
-	$footer = 1;
-
-	// Output HTML code
-	OUTPUT_HTML("");
+	OUTPUT_HTML("</html>");
+} // END - if
 
-	if (is_resource($link)) {
-		// Close link
-		SQL_CLOSE($link, __FILE__, __LINE__);
-	} else {
-		// No database link
-		ADD_FATAL(NO_DB_LINK);
-	}
-} elseif ($CSS == "1") {
-	// Footer has been reached
-	$footer = 1;
+// Footer has been reached
+$GLOBALS['footer_sent'] = 1;
 
-	// Output CSS content
-	OUTPUT_HTML("");
-}
+// Output HTML code
+OUTPUT_HTML("");
 
 //
 ?>