X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffooter.php;h=91a7bf8d27ae131c083d96db01bfbf77b40e15f3;hb=4bde8a00c73cd3188258a59ae44a6374a40a3f7a;hp=49b2f4e8312720494d0b7367e8a710a88a8f8cad;hpb=5071030af40e69ca4284642f44758964e18f5be8;p=mailer.git diff --git a/inc/footer.php b/inc/footer.php index 49b2f4e831..91a7bf8d27 100644 --- 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 ((EXT_IS_ACTIVE('uberwach')) && (getModule() != 'admin') && ($GLOBALS['header_sent'] == '2')) { + // Then display it here + loadUberwachSnippet(); + } // END - if + // Load page footer LOAD_TEMPLATE('page_footer');