X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Faction-order.php;h=73b56d9b90097ddf56361ff28930f6238633e37f;hb=fc162164725588cf75969f707faead9c9cd8e68b;hp=71fb41b0b8a030f10cbf5af531d1a8e39e7599ec;hpb=03f62d0b89aa9276ac37f4d616d940fae184d850;p=mailer.git

diff --git a/inc/modules/member/action-order.php b/inc/modules/member/action-order.php
index 71fb41b0b8..73b56d9b90 100644
--- a/inc/modules/member/action-order.php
+++ b/inc/modules/member/action-order.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 02/12/2006 *
- * ================                             Last change: 02/12/2006 *
+ * Mailer v0.2.1-FINAL                                Start: 02/12/2006 *
+ * ===================                          Last change: 02/12/2006 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : action-order.php                                 *
@@ -17,7 +17,8 @@
  * 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                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,29 +39,30 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
-} elseif (!IS_MEMBER()) {
-	redirectToUrl('modules.php?module=index');
-} elseif ((!EXT_IS_ACTIVE('order')) && (!IS_ADMIN())) {
-	addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('order'));
-	return;
-} elseif ($GLOBALS['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('order')) && (!isAdmin())) {
+	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('order'));
+	return;
+} // END - if
 
 // Load the include file
-$INC = sprintf("inc/modules/member/what-%s.php", getWhat());
-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'), getWhat()));
+	addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MEMBER_404_WHAT', getWhat()));
 }
 
-//
+// [EOF]
 ?>