New naming convention applied to many functions, see #118 for details

[mailer.git] / inc / modules / index.php

diff --git a/inc/modules/index.php b/inc/modules/index.php
index 751947117ce4b7178a304b1bba092bce05ead1a6..93b3faa943a27f5c197215fe358483532ec8627e 100644 (file)
--- a/inc/modules/index.php
+++ b/inc/modules/index.php
@@ -42,7 +42,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!EXT_IS_ACTIVE('sql_patches')) {
        // The extension 'sql_patches' *MUST* be activated or you have lot's of problems!
-       LOAD_URL('admin.php');
+       redirectToUrl('admin.php');
 }
 
 // Load adverstising template
@@ -63,7 +63,7 @@ if (empty($GLOBALS['what'])) $GLOBALS['what'] = getConfig('index_home');
 // Adding the main content module here
 if (empty($GLOBALS['action'])) {
        // Get action value from what value
-       $GLOBALS['action'] = GET_ACTION('guest', $GLOBALS['what']);
+       $GLOBALS['action'] = getModeAction('guest', $GLOBALS['what']);
 } // END - if
 
 // Add the guest's menu here...
@@ -82,12 +82,12 @@ $GLOBALS['block_mode'] = false;
 $INC = sprintf("inc/modules/guest/action-%s.php", $GLOBALS['action']);
 
 // Is the file there?
-if ((INCLUDE_READABLE($INC)) && (VALIDATE_MENU_ACTION('guest', $GLOBALS['action'], $GLOBALS['what']))) {
+if ((isIncludeReadable($INC)) && (isMenuActionValid('guest', $GLOBALS['action'], $GLOBALS['what']))) {
        // Requested module is available so we load it
-       LOAD_INC_ONCE($INC);
+       loadIncludeOnce($INC);
 } else {
        // Invalid module specified or not found...
-       LOAD_URL('modules.php?module=index');
+       redirectToUrl('modules.php?module=index');
 }
 
 if ((getConfig('guest_menu') == 'Y') || (!EXT_IS_ACTIVE('sql_patches', true))) {