More queries and language constants rewritten

[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..89989bd8b4979ff7969bc390fa639d4a21a098f4 100644 (file)
--- a/inc/modules/guest/action-main.php
+++ b/inc/modules/guest/action-main.php
@@ -35,22 +35,21 @@
 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']);
-$IS_VALID = WHAT_IS_VALID(GET_ACTION("guest", $GLOBALS['what']), $GLOBALS['what'], "guest");
-
-if ((FILE_READABLE($INC)) && ($IS_VALID)) {
+$INC = sprintf("inc/modules/guest/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
+if (FILE_READABLE($INC)) {
        // Ok, we finally load the guest action module
-       require_once($INC);
-} elseif ($IS_VALID) {
-       ADD_FATAL(GUEST_404_ACTION_1.$GLOBALS['what'].GUEST_404_ACTION_2);
+       LOAD_INC($INC);
 } else {
-       ADD_FATAL(GUEST_LOCKED_ACTION);
+       addFatalMessage(sprintf(getMessage('GUEST_404_ACTION'), SQL_ESCAPE($GLOBALS['what'])));
 }
 
 //