moved into

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

diff --git a/inc/modules/guest/action-admin.php b/inc/modules/guest/action-admin.php
index 39c8bbb899d9a4bfc470a7ffbab4986787ef63c4..038bf7cc91875671f489edb0363a6754ec36e918 100644 (file)
--- a/inc/modules/guest/action-admin.php
+++ b/inc/modules/guest/action-admin.php
@@ -35,20 +35,18 @@
 if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
-} elseif ($BLOCK_MODE) {
+} elseif ($GLOBALS['block_mode']) {
        // Block mode detected
        return;
 }
 
 // Only when one admin link is clicked...
-$INC = sprintf("%sinc/modules/guest/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+$INC = sprintf("inc/modules/guest/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the guest action module
-       require($INC);
-} elseif ($IS_VALID) {
-       addFatalMessage(sprintf(getMessage('GUEST_404_ACTION'), SQL_ESCAPE($GLOBALS['what'])));
+       LOAD_INC($INC);
 } else {
-       addFatalMessage(sprintf(getMessage('GUEST_LOCKED_ACTION'), SQL_ESCAPE($GLOBALS['what'])));
+       addFatalMessage(__FILE__, __LINE__, getMessage('GUEST_404_ACTION'), $GLOBALS['what']);
 }
 
 //