'what','action','module' and 'output_mode' wrapped into functions (WARNUNG: Code...

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

diff --git a/inc/modules/guest/action-main.php b/inc/modules/guest/action-main.php
index a04f127f236e46e35aa662851623ef134c1974de..2515ae59d8b050d27c02c7d1889655a2df5ebefe 100644 (file)
--- a/inc/modules/guest/action-main.php
+++ b/inc/modules/guest/action-main.php
@@ -38,7 +38,7 @@
 
 // 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 ($GLOBALS['block_mode']) {
        // Block mode detected
@@ -46,15 +46,15 @@ if (!defined('__SECURITY')) {
 }
 
 // Add description as navigation point
-ADD_DESCR("guest", __FILE__);
+ADD_DESCR('guest', __FILE__);
 
 // Load the include file
-$INC = sprintf("inc/modules/guest/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (INCLUDE_READABLE($INC)) {
+$INC = sprintf("inc/modules/guest/what-%s.php", getWhat());
+if (isIncludeReadable($INC)) {
        // Ok, we finally load the guest action module
-       LOAD_INC($INC);
+       loadInclude($INC);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMessage('GUEST_404_ACTION'), $GLOBALS['what']);
+       addFatalMessage(__FILE__, __LINE__, getMessage('GUEST_404_ACTION'), getWhat());
 }
 
 //