Fixes in changing URLs in surfbar extension. Resolves #40/#41

[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 19b460abbe75d7f8a3c20817ee7ecd18f7e2e481..c2090cdf441cb5dd74a79bed312b92d183754594 100644 (file)
--- a/inc/modules/member/action-surfbar.php
+++ b/inc/modules/member/action-surfbar.php
@@ -36,7 +36,10 @@ 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");
+       LOAD_URL("modules.php?module=index");
+} elseif ((!EXT_IS_ACTIVE("surfbar")) && (!IS_ADMIN())) {
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "surfbar");
+       return;
 } elseif ($BLOCK_MODE) {
        // Block mode detected
        return;
@@ -49,9 +52,9 @@ ADD_DESCR("member", __FILE__);
 $INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC_WHAT)) {
        // Ok, we finally load the member action module
-       include_once($INC_WHAT);
+       require($INC_WHAT);
 } else {
-       ADD_FATAL(MEMBER_404_ACTION_1.$GLOBALS['what'].MEMBER_404_ACTION_2);
+       addFatalMessage(MEMBER_404_ACTION_1.$GLOBALS['what'].MEMBER_404_ACTION_2);
 }
 
 //