config.php partly solved, see #117

[mailer.git] / inc / footer.php

diff --git a/inc/footer.php b/inc/footer.php
index 556022f0bff0d16b97ce3e44dcd5e84f2760360a..d822c4eb7fbf31158211b3171f428b0932cbed79 100644 (file)
--- a/inc/footer.php
+++ b/inc/footer.php
@@ -45,7 +45,7 @@ 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'))) && ($GLOBALS['output_mode'] != '1'))) {
        // Output the generated HTML code or do nothing in direct-mode
        if (getTotalFatalErrors() > 0) {
                // Output fatal error messages
@@ -53,9 +53,9 @@ if ((((!isset($GLOBALS['footer_sent'])) || (($GLOBALS['footer_sent'] != "1") &&
        } // END - if
 
        // Shall we display the copyright notice?
-       if ((!REQUEST_ISSET_GET(('frame'))) && (basename($_SERVER['PHP_SELF']) != "mailid_top.php") && (isBooleanConstantAndTrue('WRITE_FOOTER')) && ($GLOBALS['header_sent'] == "2")) {
+       if ((!REQUEST_ISSET_GET(('frame'))) && (basename($_SERVER['PHP_SELF']) != "mailid_top.php") && (getConfig('WRITE_FOOTER') == 'Y') && ($GLOBALS['header_sent'] == '2')) {
                // Backlink enabled?
-               if (isBooleanConstantAndTrue('ENABLE_BACKLINK')) {
+               if ((getConfig('ENABLE_BACKLINK') == 'Y') || (isInstalling())) {
                        // Copyright with backlink, thanks! :-)
                        LOAD_TEMPLATE("copyright_backlink");
                } else {
@@ -65,7 +65,7 @@ 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