Global variables rewritten

[mailer.git] / inc / footer.php

diff --git a/inc/footer.php b/inc/footer.php
index 9a7b05ffd9cf30f4762cb641013d379bbab64638..365b5dceece923ae634a90c9dbfa9e1f880e7129 100644 (file)
--- a/inc/footer.php
+++ b/inc/footer.php
@@ -32,7 +32,7 @@
  ************************************************************************/
 
 // Global variable stuff
-global $link, $frame, $CSS, $header;
+global $link, $frame;
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
@@ -40,18 +40,16 @@ if (!defined('__SECURITY')) {
        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?
+if (($GLOBALS['footer_sent'] != "1") && ($GLOBALS['footer_sent'] != "2") && ($GLOBALS['output_mode'] != "1")) {
        // Output the generated HTML code or do nothing in direct-mode
-       if (getTotalFatalMessages() > 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 ((empty($frame)) && (empty($_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,7 +61,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") && (empty($_GET['frame'])) && ($GLOBALS['header_sent'] == "2")) {
                // Then display it here
                DISPLAY_PARSING_TIME_FOOTER();
        } // END - if
@@ -76,7 +74,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("");