From: Roland Häder Date: Mon, 1 Sep 2008 11:17:51 +0000 (+0000) Subject: Fix for missing footer X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=96fd2e894833814cc3fb12b0294146cf55941508;p=mailer.git Fix for missing footer --- diff --git a/inc/footer.php b/inc/footer.php index 381b1f982d..69b37d9c7f 100644 --- a/inc/footer.php +++ b/inc/footer.php @@ -48,12 +48,12 @@ if (($footer != "1") && ($footer != "2") && ($CSS != "1")) { } // Shall we display the copyright notice? - if ((empty($frame)) && (!isset($_GET['frame'])) && (basename($_SERVER['PHP_SELF']) != "mailid_top.php") && (isBooleanConstantAndTrue('WRITE_FOOTER'))) { + if ((empty($frame)) && (empty($_GET['frame'])) && (basename($_SERVER['PHP_SELF']) != "mailid_top.php") && (isBooleanConstantAndTrue('WRITE_FOOTER'))) { LOAD_TEMPLATE("copyright"); } // Shall we display the parsing time and number of queries? - if ((isset($_CONFIG['show_timings'])) && ($_CONFIG['show_timings'] == "Y") && (!isset($_GET['frame']))) { + if ((isset($_CONFIG['show_timings'])) && ($_CONFIG['show_timings'] == "Y") && (empty($_GET['frame']))) { // Then display it here DISPLAY_PARSING_TIME_FOOTER(); } diff --git a/inc/header.php b/inc/header.php index 2107e845a1..3e31030b38 100644 --- a/inc/header.php +++ b/inc/header.php @@ -101,22 +101,19 @@ if (($header != "1") && ($header != "2")) { if ((isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('admin_registered')) && ($GLOBALS['module'] != "admin") && ($GLOBALS['module'] != "login") && (isset($db)) && (isset($link))) { // Add meta description not in admin and login module and when the script is installed META_DESCRIPTION($GLOBALS['module'], $GLOBALS['what']); - } + } // END - if // Include more header data here LOAD_TEMPLATE("header"); // Include stylesheet include (PATH."inc/stylesheet.php"); - } + } // END - if // Closing HEAD tag if ($CSS != "1") OUTPUT_HTML(""); $header = 1; -} - -// Set unsetted variables -if (empty($_GET['frame'])) $_GET['frame'] = ""; +} // END - if // Load body or not if ((($GLOBALS['module'] != "frametester")) || (($header == "1") && ($GLOBALS['module'] == "frametester") && (!empty($_GET['frame']))) && ($CSS != "1")) { @@ -124,9 +121,9 @@ if ((($GLOBALS['module'] != "frametester")) || (($header == "1") && ($GLOBALS['m if (($header == "1") && (basename($_SERVER['PHP_SELF']) != "mailid.php") && ($CSS != "1")) { // Add BODY tag LOAD_TEMPLATE("page_body"); - $header = 2; - } -} + $header = 2; + } // END - if +} // END - if // ?>