HTML->XHTML preparation (still *A LOT* to convert

[mailer.git] / inc / footer.php

diff --git a/inc/footer.php b/inc/footer.php
index 6d4b63cdd2b18c47b4b7d9d6c4cb15cc64abec75..9a7b05ffd9cf30f4762cb641013d379bbab64638 100644 (file)
--- a/inc/footer.php
+++ b/inc/footer.php
@@ -45,7 +45,7 @@ if (!isset($footer)) $footer = 0;
 
 if (($footer != "1") && ($footer != "2") && ($CSS != "1")) {
        // Output the generated HTML code or do nothing in direct-mode
-       if (!empty($FATAL[0])) {
+       if (getTotalFatalMessages() > 0) {
                // Output fatal error messages
                require_once(PATH."inc/fatal_errors.php");
        } // END - if
@@ -63,40 +63,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") && (empty($_GET['frame'])) && ($header == "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
+$footer = 1;
 
-       // Output CSS content
-       OUTPUT_HTML("");
-}
+// Output HTML code
+OUTPUT_HTML("");
 
 //
 ?>