getTotalFatalErrors() is now the right name

[mailer.git] / inc / footer.php

diff --git a/inc/footer.php b/inc/footer.php
index ed888b44692142fedee53838353ebb1f3d0c7529..c32e5cdbde0ddffcf0f740394787a26d8744d89f 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,56 +40,44 @@ 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");
        } // 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")) {
-               LOAD_TEMPLATE("copyright");
+               // Backlink enabled?
+               if (isBooleanConstantAndTrue('ENABLE_BACKLINK')) {
+                       // Copyright with backlink, thanks! :-)
+                       LOAD_TEMPLATE("copyright_backlink");
+               } else {
+                       // No backlink in Copyright note
+                       LOAD_TEMPLATE("copyright");
+               }
        } // 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("");
 
 //
 ?>