Frameset support entirely removed, TODO extended, minor template fix

[mailer.git] / inc / modules / guest / action-main.php

diff --git a/inc/modules/guest/action-main.php b/inc/modules/guest/action-main.php
index 854a7d896f7e3e6a812e73f0ffb181b431bd88cb..3177c102275230293ae1bffe8308576d2eba5e02 100644 (file)
--- a/inc/modules/guest/action-main.php
+++ b/inc/modules/guest/action-main.php
@@ -35,13 +35,16 @@
 if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
+} elseif ($BLOCK_MODE) {
+       // Block mode detected
+       return;
 }
 
 // Add description as navigation point
-ADD_DESCR("guest", basename(__FILE__));
+ADD_DESCR("guest", __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/guest/what-%s.php", PATH, $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/guest/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 $IS_VALID = WHAT_IS_VALID(GET_ACTION("guest", $GLOBALS['what']), $GLOBALS['what'], "guest");
 
 if ((FILE_READABLE($INC)) && ($IS_VALID)) {