New wrapper functions enableBlockMode() and isBlockModeEnabled() introduced

[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 c4ee350af49738e5652ee6e59af0f11cf3a29d0b..85a5775f14afa917f06dabf24d4f3059c09556c0 100644 (file)
--- a/inc/modules/member/action-logout.php
+++ b/inc/modules/member/action-logout.php
@@ -41,8 +41,8 @@ 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']) {
+       redirectToUrl('modules.php?module=index');
+} elseif (isBlockModeEnabled()) {
        // Block mode detected
        return;
 }
@@ -51,12 +51,12 @@ if (!defined('__SECURITY')) {
 ADD_DESCR('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_ACTION'), getWhat()));
 }
 
 //