More misc fixes and rewrites (sorry, lame description)

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

diff --git a/inc/modules/guest/action- b/inc/modules/guest/action-
index d8c3188863f84adbdac837edf1f6fa03bfd3ced9..cf4f43962a47ae245f1d0b0e3048d8d8e03bc501 100644 (file)
--- a/inc/modules/guest/action-
+++ b/inc/modules/guest/action-
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif ((!EXT_IS_ACTIVE('')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, EXTENSION_PROBLEM_EXT_INACTIVE, "");
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage(''));
        return;
 } elseif ($BLOCK_MODE) {
        // Block mode detected
@@ -52,14 +52,14 @@ if (!defined('__SECURITY')) {
 ADD_DESCR('guest', __FILE__);
 
 // Load the include file
-$INC = sprintf("inc/modules/guest/what-%s.php", $GLOBALS['what']);
+$INC = sprintf("inc/modules/guest/what-%s.php", getWhat());
 if (isIncludeReadable($INC)) {
        // Ok, we finally load the guest action module
        loadInclude($INC);
 } elseif ($IS_VALID) {
-       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('GUEST_404_ACTION'), SQL_ESCAPE($GLOBALS['what'])));
+       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('GUEST_404_ACTION'), getWhat()));
 } else {
-       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('GUEST_LOCKED_ACTION'), SQL_ESCAPE($GLOBALS['what'])));
+       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('GUEST_LOCKED_ACTION'), getWhat()));
 }
 
 //