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 043b58fd6f59aaeba2ba91df0308d82196bc8d73..85a5775f14afa917f06dabf24d4f3059c09556c0 100644 (file)
--- a/inc/modules/member/action-logout.php
+++ b/inc/modules/member/action-logout.php
@@ -38,25 +38,25 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $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;
 }
 
 // Add description as navigation point
-ADD_DESCR("member", __FILE__);
+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()));
 }
 
 //