New wrapper functions enableBlockMode() and isBlockModeEnabled() introduced

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

diff --git a/inc/modules/member/action- b/inc/modules/member/action-
index a6f03ff3acc61daf2c1f2372681cc16f11ddf21b..da78c8466dbae6aec731384c7329c2afcc0e492c 100644 (file)
--- a/inc/modules/member/action-
+++ b/inc/modules/member/action-
@@ -38,12 +38,12 @@
 
 // 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_LOGGED_IN()) {
-       LOAD_URL(URL."/modules.php?module=index");
-} elseif ((!EXT_IS_ACTIVE("")) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, EXTENSION_PROBLEM_EXT_INACTIVE, "");
+       redirectToUrl('modules.php?module=index');
+} elseif ((!EXT_IS_ACTIVE('')) && (!IS_ADMIN())) {
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage(''));
        return;
 } elseif ($BLOCK_MODE) {
        // Block mode detected
@@ -51,15 +51,15 @@ if (!defined('__SECURITY')) {
 }
 
 // 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 (FILE_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__, getMessage('MEMBER_404_ACTION'), getWhat());
 }
 
 //