sql_patches will never have language/function includes...

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

diff --git a/inc/modules/index.php b/inc/modules/index.php
index ff21a48c258f0de5aecf113ce561ad4cf0f04fc2..93b3faa943a27f5c197215fe358483532ec8627e 100644 (file)
--- a/inc/modules/index.php
+++ b/inc/modules/index.php
@@ -42,20 +42,20 @@ 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
-define('__GUEST_ADVERT', LOAD_TEMPLATE("guest_advert", true));
+define('__GUEST_ADVERT', LOAD_TEMPLATE('guest_advert', true));
 
 // Generate a tableset for the menu title and content
-LOAD_TEMPLATE("guest_header");
+LOAD_TEMPLATE('guest_header');
 
 // Add code-message here
 handleCodeMessage();
 
 // Some of you needs this to be extracted into a template... ???
-LOAD_TEMPLATE("guest_menu_td");
+LOAD_TEMPLATE('guest_menu_td');
 
 // When no what value is provided take the "home" value
 if (empty($GLOBALS['what'])) $GLOBALS['what'] = getConfig('index_home');
@@ -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...
@@ -73,7 +73,7 @@ if ((getConfig('guest_menu') == 'Y') || (!EXT_IS_ACTIVE('sql_patches', true))) {
 } // END - if
 
 // TDs between menu and content
-LOAD_TEMPLATE("guest_menu_content");
+LOAD_TEMPLATE('guest_menu_content');
 
 // Disable block-mode by default
 $GLOBALS['block_mode'] = false;
@@ -82,30 +82,30 @@ $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))) {
        // Right side of content (hint: a good place for 120x600 skyscraper banner!)
-       LOAD_TEMPLATE("guest_content_footer");
+       LOAD_TEMPLATE('guest_content_footer');
 
        // Some advertising stuff?
-       LOAD_TEMPLATE("guest_advert2");
+       LOAD_TEMPLATE('guest_advert2');
 
        OUTPUT_HTML("  </td>
 </tr>");
 
        // Goto TOP template
-       LOAD_TEMPLATE("guest_goto_top");
+       LOAD_TEMPLATE('guest_goto_top');
 } // END - if
 
 // Footer template (Thanx to Mr. Glaus!)
-LOAD_TEMPLATE("guest_footer");
+LOAD_TEMPLATE('guest_footer');
 
 //
 ?>