X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Faction-;h=6eee351e8b96545feee364a20f5d29ab0845df2e;hb=854fcac4ae5fe26e28e9d4d7b8361f2ab455aeb1;hp=1baf1ad3cc1f06f6117ae00ee34f3fc2b520f958;hpb=7b0f17cd637e388049d2167811e4332cec1e979b;p=mailer.git

diff --git a/inc/modules/member/action- b/inc/modules/member/action-
index 1baf1ad3cc..6eee351e8b 100644
--- a/inc/modules/member/action-
+++ b/inc/modules/member/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,30 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
-} elseif (!IS_LOGGED_IN()) {
-	redirectToUrl(URL."/modules.php?module=index");
-} elseif ((!EXT_IS_ACTIVE("")) && (!IS_ADMIN())) {
-	addFatalMessage(__FILE__, __LINE__, EXTENSION_PROBLEM_EXT_INACTIVE, "");
-	return;
-} elseif ($BLOCK_MODE) {
+	die();
+} elseif (!isMember()) {
+	redirectToIndexMemberOnlyModule();
+} elseif (isBlockModeEnabled()) {
 	// Block mode detected
 	return;
 }
 
 // Add description as navigation point
-ADD_DESCR('member', __FILE__);
+addMenuDescription('member', __FILE__);
+
+if ((!isExtensionActive('')) && (!isAdmin())) {
+	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage(''));
+	return;
+} // END - if
 
 // Load the include file
-$INC = sprintf("inc/modules/member/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (isIncludeReadable($INC)) {
+$inc = sprintf("inc/modules/member/what-%s.php", getWhat());
+if (isIncludeReadable($inc)) {
 	// Ok, we finally load the member action module
-	loadInclude($INC);
+	loadInclude($inc);
 } else {
-	addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('MEMBER_404_ACTION'), $GLOBALS['what']));
+	addFatalMessage(__FILE__, __LINE__, getMessage('MEMBER_404_ACTION'), getWhat());
 }
 
-//
+// [EOF]
 ?>