More constant rewrites

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

diff --git a/inc/modules/member/action-surfbar.php b/inc/modules/member/action-surfbar.php
index f1f864698d2e701823a97e92fb0c255067460581..2449adec38e10464af9a5c2af06f2ec89e872743 100644 (file)
--- a/inc/modules/member/action-surfbar.php
+++ b/inc/modules/member/action-surfbar.php
@@ -36,9 +36,9 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif (!IS_MEMBER()) {
-       LOAD_URL(URL."/modules.php?module=index");
-} elseif (!EXT_IS_ACTIVE("surfbar")) {
-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "surfbar");
+       LOAD_URL("modules.php?module=index");
+} elseif ((!EXT_IS_ACTIVE("surfbar")) && (!IS_ADMIN())) {
+       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "surfbar");
        return;
 } elseif ($BLOCK_MODE) {
        // Block mode detected
@@ -49,12 +49,12 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("member", __FILE__);
 
 // Load the include file
-$INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC_WHAT)) {
+$INC = sprintf("inc/modules/member/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the member action module
-       include_once($INC_WHAT);
+       LOAD_INC($INC);
 } else {
-       ADD_FATAL(MEMBER_404_ACTION_1.$GLOBALS['what'].MEMBER_404_ACTION_2);
+       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('MEMBER_404_ACTION'), $GLOBALS['what']));
 }
 
 //