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 2c6d438a15e02441c96ec9c7657bfffa226f69e7..a1eb5eb9e4e5480769298ec5bed094bf13521a57 100644 (file)
--- a/inc/modules/guest/action-
+++ b/inc/modules/guest/action-
@@ -32,22 +32,29 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
+} elseif ((!EXT_IS_ACTIVE("")) && (!IS_ADMIN())) {
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "");
+       return;
+} 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(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'])));
 }
 
 //