Huge rewrite:

[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 a555c07e79914463f22311a1839ec9a716f178ca..9b7e984c4ab41421b93737c79f9cecafa242c64a 100644 (file)
--- a/inc/modules/guest/action-main.php
+++ b/inc/modules/guest/action-main.php
@@ -40,7 +40,7 @@
 if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
-} elseif ($GLOBALS['block_mode']) {
+} elseif (isBlockModeEnabled()) {
        // Block mode detected
        return;
 }
@@ -49,12 +49,12 @@ if (!defined('__SECURITY')) {
 ADD_DESCR('guest', __FILE__);
 
 // Load the include file
-$INC = sprintf("inc/modules/guest/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
+$INC = sprintf("inc/modules/guest/what-%s.php", getWhat());
 if (isIncludeReadable($INC)) {
        // Ok, we finally load the guest action module
        loadInclude($INC);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMessage('GUEST_404_ACTION'), $GLOBALS['what']);
+       addFatalMessage(__FILE__, __LINE__, getMessage('GUEST_404_ACTION'), getWhat());
 }
 
 //