X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Faction-;h=3a71404735fe12c6201485be5694e0327bd56d4a;hb=9afd6ec5878544a7982c50ed9c0dd7de37606d5b;hp=cf4f43962a47ae245f1d0b0e3048d8d8e03bc501;hpb=03f62d0b89aa9276ac37f4d616d940fae184d850;p=mailer.git

diff --git a/inc/modules/guest/action- b/inc/modules/guest/action-
index cf4f43962a..3a71404735 100644
--- a/inc/modules/guest/action-
+++ b/inc/modules/guest/action-
@@ -17,7 +17,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,29 +38,28 @@
 
 // Some security stuff...
 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__, generateExtensionInactiveNotInstalledMessage(''));
-	return;
-} elseif ($BLOCK_MODE) {
+	die();
+} elseif (isBlockModeEnabled()) {
 	// Block mode detected
 	return;
 }
 
 // Add description as navigation point
-ADD_DESCR('guest', __FILE__);
+addMenuDescription('guest', __FILE__);
+
+if ((!isExtensionActive('')) && (!isAdmin())) {
+	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage(''));
+	return;
+}
 
 // Load the include file
-$INC = sprintf("inc/modules/guest/what-%s.php", getWhat());
-if (isIncludeReadable($INC)) {
+$inc = sprintf("inc/modules/guest/what-%s.php", getWhat());
+if (isIncludeReadable($inc)) {
 	// Ok, we finally load the guest action module
-	loadInclude($INC);
-} elseif ($IS_VALID) {
-	addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('GUEST_404_ACTION'), getWhat()));
+	loadInclude($inc);
 } else {
 	addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('GUEST_LOCKED_ACTION'), getWhat()));
 }
 
-//
+// [EOF]
 ?>