Huge rewrite of default parameters, ext-network continued:

[mailer.git] / inc / modules / member / action-logout.php

diff --git a/inc/modules/member/action-logout.php b/inc/modules/member/action-logout.php
index 043b58fd6f59aaeba2ba91df0308d82196bc8d73..44a6be652947312bf4158e74e43f27ccb0b1bb01 100644 (file)
--- a/inc/modules/member/action-logout.php
+++ b/inc/modules/member/action-logout.php
@@ -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,26 +38,25 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-       require($INC);
-} elseif (!IS_MEMBER()) {
-       LOAD_URL("modules.php?module=index");
-} 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__);
 
 // Load the include file
-$INC = sprintf("inc/modules/member/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (INCLUDE_READABLE($INC)) {
+$inc = sprintf("inc/modules/member/what-%s.php", getWhat());
+if (isIncludeReadable($inc)) {
        // Ok, we finally load the member action module
-       LOAD_INC($INC);
+       loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('MEMBER_404_ACTION'), $GLOBALS['what']));
+       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('MEMBER_404_WHAT'), getWhat()));
 }
 
-//
+// [EOF]
 ?>