Fixes for broken order page and themes

[mailer.git] / inc / footer.php

diff --git a/inc/footer.php b/inc/footer.php
index 68432f83c4475df9b7e30d05261abf8cf4ff5229..9c97434af5092f2a7b4a73b4ecf7266927e698b8 100644 (file)
--- a/inc/footer.php
+++ b/inc/footer.php
@@ -17,7 +17,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -36,55 +36,60 @@
  * MA  02110-1301  USA                                                  *
  ************************************************************************/
 
-// Global variable stuff
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-       require($INC);
+       die();
 } // END - if
 
 // Footer disabled or already sent?
 // 1234      5                       54    45                              5    5                              543    3                              321
-if ((((!isset($GLOBALS['footer_sent'])) || (($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
-               loadIncludeOnce('inc/fatal_errors.php');
-       } // END - if
+if ((((!isset($GLOBALS['footer_sent'])) || (($GLOBALS['footer_sent'] != '1') && ($GLOBALS['footer_sent'] != '2'))) && (getOutputMode() != '1'))) {
+       // @TODO Rewrite these all into filters
+       // Handle fatal errors
+       handleFatalErrors();
 
        // Shall we display the copyright notice?
-       if ((!REQUEST_ISSET_GET('frame')) && (basename($_SERVER['PHP_SELF']) != 'mailid_top.php') && (getConfig('WRITE_FOOTER') == 'Y') && ($GLOBALS['header_sent'] == '2')) {
+       if ((!isGetRequestElementSet('frame')) && (basename($_SERVER['PHP_SELF']) != 'mailid_top.php') && ((getConfig('WRITE_FOOTER') == 'Y') || (isInstalling())) && ($GLOBALS['header_sent'] == '2')) {
                // Backlink enabled?
                if ((getConfig('ENABLE_BACKLINK') == 'Y') || (isInstalling())) {
                        // Copyright with backlink, thanks! :-)
-                       LOAD_TEMPLATE('copyright_backlink');
+                       loadTemplate('copyright_backlink');
                } else {
                        // No backlink in Copyright note
-                       LOAD_TEMPLATE('copyright');
+                       loadTemplate('copyright');
                }
        } // END - if
 
        // Shall we display the parsing time and number of queries?
-       if ((GET_EXT_VERSION('sql_patches') >= '0.4.1') && (getConfig('show_timings') == 'Y') && (!REQUEST_ISSET_GET('frame')) && ($GLOBALS['header_sent'] == '2')) {
+       if ((((isExtensionInstalledAndNewer('sql_patches', '0.4.1')) && (getConfig('show_timings') == 'Y') && (!isGetRequestElementSet('frame'))) || (isInstallationPhase())) && ($GLOBALS['header_sent'] == '2')) {
                // Then display it here
                displayParsingTime();
        } // END - if
 
+       // Shall we display SQL queries?
+       if ((isAdmin()) && (isExtensionInstalledAndNewer('other', '0.2.2')) && (getConfig('display_debug_sqls') == 'Y') && (!isGetRequestElementSet('frame')) && ($GLOBALS['header_sent'] == '2')) {
+               // Then display it here
+               displayDebugSqls();
+       } // END - if
+
+       // Shall we include the uberwach snippet?
+       if ((!isGetRequestElementSet('frame')) && (isExtensionActive('uberwach')) && (getModule() != 'admin') && ($GLOBALS['header_sent'] == '2')) {
+               // Then display it here
+               loadUberwachSnippet();
+       } // END - if
+
        // Load page footer
-       LOAD_TEMPLATE('page_footer');
+       loadTemplate('page_footer');
 
        // And the last closing HTML tag
-       OUTPUT_HTML('</html>');
+       outputHtml('</html>');
 } // END - if
 
 // Footer has been reached
 $GLOBALS['footer_sent'] = 1;
 
-// Output HTML code
-OUTPUT_HTML('');
-
 // Shutdown
 shutdown();
 
-//
+// [EOF]
 ?>