HTML->XHTML preparation (still *A LOT* to convert

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

diff --git a/inc/modules/guest/action- b/inc/modules/guest/action-
index c5c60dbc4971e6e57d1e6fb1c6adc4f0df2c7d24..a1eb5eb9e4e5480769298ec5bed094bf13521a57 100644 (file)
--- a/inc/modules/guest/action-
+++ b/inc/modules/guest/action-
@@ -35,8 +35,8 @@
 if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
-} elseif (!EXT_IS_ACTIVE("")) {
-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "");
+} elseif ((!EXT_IS_ACTIVE("")) && (!IS_ADMIN())) {
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "");
        return;
 } elseif ($BLOCK_MODE) {
        // Block mode detected
@@ -51,8 +51,10 @@ $INC = sprintf(PATH."inc/modules/guest/what-%s.php", $GLOBALS['what']);
 if (FILE_READABLE($INC)) {
        // Ok, we finally load the guest action module
        include($INC);
+} elseif ($IS_VALID) {
+       addFatalMessage(sprintf(getMessage('GUEST_404_ACTION'), SQL_ESCAPE($GLOBALS['what'])));
 } else {
-       ADD_FATAL(GUEST_404_ACTION_1.$GLOBALS['what'].GUEST_404_ACTION_2);
+       addFatalMessage(sprintf(getMessage('GUEST_LOCKED_ACTION'), SQL_ESCAPE($GLOBALS['what'])));
 }
 
 //