More globals rewritten, see #100

[mailer.git] / inc / footer.php

diff --git a/inc/footer.php b/inc/footer.php
index c32e5cdbde0ddffcf0f740394787a26d8744d89f..47e3ed7b381f37ad3b95a04eaefb19373ce8a8bb 100644 (file)
--- 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,15 +39,15 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Footer disabled or already sent?
-if (($footer != "1") && ($footer != "2") && ($CSS != "1")) {
+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 (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($_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 +59,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
@@ -74,7 +72,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("");