bigintval() made to much trouble, uberwach wont be displayed in frames anymore

[mailer.git] / inc / footer.php

diff --git a/inc/footer.php b/inc/footer.php
index 49b2f4e8312720494d0b7367e8a710a88a8f8cad..7d6a2f81720e5f98529c9933ef412d8f8d2c986c 100644 (file)
--- a/inc/footer.php
+++ b/inc/footer.php
@@ -45,15 +45,16 @@ if (!defined('__SECURITY')) {
 
 // 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'))) {
+if ((((!isset($GLOBALS['footer_sent'])) || (($GLOBALS['footer_sent'] != '1') && ($GLOBALS['footer_sent'] != '2'))) && (getOutputMode() != '1'))) {
        // Output the generated HTML code or do nothing in direct-mode
+       // @TODO Rewrite these all into filters
        if (getTotalFatalErrors() > 0) {
                // Output fatal error messages
                loadIncludeOnce('inc/fatal_errors.php');
        } // END - if
 
        // 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 ((!REQUEST_ISSET_GET('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! :-)
@@ -65,11 +66,17 @@ if ((((!isset($GLOBALS['footer_sent'])) || (($GLOBALS['footer_sent'] != '1') &&
        } // 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 ((GET_EXT_VERSION('sql_patches') >= '0.4.1') && (getConfig('show_timings') == 'Y') && (!REQUEST_ISSET_GET('frame')) && ($GLOBALS['header_sent'] == '2')) {
                // Then display it here
                displayParsingTime();
        } // END - if
 
+       // Shall we include the uberwach snippet?
+       if ((!REQUEST_ISSET_GET('frame')) && (EXT_IS_ACTIVE('uberwach')) && (getModule() != 'admin') && ($GLOBALS['header_sent'] == '2')) {
+               // Then display it here
+               loadUberwachSnippet();
+       } // END - if
+
        // Load page footer
        LOAD_TEMPLATE('page_footer');