X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Faction-;h=f8ad401be92a2e0b54e17c68a73fc95809e28145;hb=d32a5a6c4e9287611853e7187a5d6d1b05794bdb;hp=2c6d438a15e02441c96ec9c7657bfffa226f69e7;hpb=4ef4c88fc481335dc0631b223111c15a84cccb51;p=mailer.git

diff --git a/inc/modules/guest/action- b/inc/modules/guest/action-
index 2c6d438a15..f8ad401be9 100644
--- 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(__FILE__, __LINE__, 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']);
+$INC = sprintf("inc/modules/guest/what-%s.php", $GLOBALS['what']);
 if (FILE_READABLE($INC)) {
 	// Ok, we finally load the guest action module
-	include($INC);
+	LOAD_INC($INC);
+} elseif ($IS_VALID) {
+	addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('GUEST_404_ACTION'), SQL_ESCAPE($GLOBALS['what'])));
 } else {
-	ADD_FATAL(GUEST_404_ACTION_1.$GLOBALS['what'].GUEST_404_ACTION_2);
+	addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('GUEST_LOCKED_ACTION'), SQL_ESCAPE($GLOBALS['what'])));
 }
 
 //