All, except security block, include()/require() rewritten to own LOAD_INC()/LOAD_INC_...

[mailer.git] / inc / modules / guest / action-sponsor.php

diff --git a/inc/modules/guest/action-sponsor.php b/inc/modules/guest/action-sponsor.php
index 2cd8983eda93c8460b37acad88f77f2194e0fb33..d2a0a9c9eb912cb946f93273ef110dc5a79010ae 100644 (file)
--- a/inc/modules/guest/action-sponsor.php
+++ b/inc/modules/guest/action-sponsor.php
@@ -34,8 +34,8 @@
 if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";
        require($INC);
-} elseif (!EXT_IS_ACTIVE("sponsor")) {
-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "sponsor");
+} elseif ((!EXT_IS_ACTIVE("sponsor")) && (!IS_ADMIN())) {
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "sponsor");
        return;
 } elseif ($BLOCK_MODE) {
        // Block mode detected
@@ -46,12 +46,14 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("guest", __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/guest/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
+$INC = sprintf("inc/modules/guest/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC)) {
        // Ok, we finally load the guest action module
-       include($INC);
+       LOAD_INC($INC);
+} elseif ($IS_VALID) {
+       addFatalMessage(sprintf(getMessage('GUEST_404_ACTION'), SQL_ESCAPE($GLOBALS['what'])));
 } else {
-       ADD_FATAL(GUEST_404_ACTION_1.$GLOBALS['what'].GUEST_404_ACTION_2);
+       addFatalMessage(sprintf(getMessage('GUEST_LOCKED_ACTION'), SQL_ESCAPE($GLOBALS['what'])));
 }
 
 //