Security line in all includes changed

[mailer.git] / inc / footer.php

diff --git a/inc/footer.php b/inc/footer.php
index bbb91a4a20985e87951730252917a959442c8416..ed888b44692142fedee53838353ebb1f3d0c7529 100644 (file)
--- a/inc/footer.php
+++ b/inc/footer.php
@@ -35,11 +35,14 @@
 global $link, $frame, $CSS, $header;
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } // END - if
 
+// @TODO Workaround for css.php
+if (!isset($footer)) $footer = 0;
+
 if (($footer != "1") && ($footer != "2") && ($CSS != "1")) {
        // Output the generated HTML code or do nothing in direct-mode
        if (!empty($FATAL[0])) {
@@ -58,8 +61,11 @@ if (($footer != "1") && ($footer != "2") && ($CSS != "1")) {
                DISPLAY_PARSING_TIME_FOOTER();
        } // END - if
 
-       // Load page footer
-       LOAD_TEMPLATE("page_footer");
+       // Not in frameset mode?
+       if ((!isset($isFrameset)) || ($isFrameset === false)) {
+               // Load page footer
+               LOAD_TEMPLATE("page_footer");
+       } // END - if
 
        // And the last closing HTML tag
        OUTPUT_HTML("</HTML>");