All, except security block, include()/require() rewritten to own LOAD_INC()/LOAD_INC_...

[mailer.git] / inc / footer.php

diff --git a/inc/footer.php b/inc/footer.php
index c911ac5554168ef6dc078ceab51fe11e8f146037..e2d31c6e6d9d3f2c32375c71ea804043cf53b0c1 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, $CSS, $header, $footer;
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
@@ -40,14 +40,12 @@ if (!defined('__SECURITY')) {
        require($INC);
 } // END - if
 
-// @TODO Workaround for css.php
-if (!isset($footer)) $footer = 0;
-
+// Footer disabled or already sent?
 if (($footer != "1") && ($footer != "2") && ($CSS != "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?
@@ -63,7 +61,7 @@ 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") && (empty($_GET['frame'])) && ($header == "2")) {
                // Then display it here
                DISPLAY_PARSING_TIME_FOOTER();
        } // END - if
@@ -73,27 +71,13 @@ if (($footer != "1") && ($footer != "2") && ($CSS != "1")) {
 
        // And the last closing HTML tag
        OUTPUT_HTML("</html>");
+} // END - if
 
-       // Footer has been reached
-       $footer = 1;
-
-       // Output HTML code
-       OUTPUT_HTML("");
-
-       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
+$footer = 1;
 
-       // Output CSS content
-       OUTPUT_HTML("");
-}
+// Output HTML code
+OUTPUT_HTML("");
 
 //
 ?>