More misc fixes and rewrites (sorry, lame description)

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

diff --git a/inc/modules/index.php b/inc/modules/index.php
index ff21a48c258f0de5aecf113ce561ad4cf0f04fc2..7c13b54fa4124644645ea50832c5a56b39f5f89e 100644 (file)
--- a/inc/modules/index.php
+++ b/inc/modules/index.php
@@ -42,70 +42,70 @@ 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('modules.php?module=admin&ext_missing=sql_patches');
 }
 
 // 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');
+if (!isWhatSet()) setWhatFromConfig('index_home');
 
 // Adding the main content module here
-if (empty($GLOBALS['action'])) {
+if (!isActionSet()) {
        // Get action value from what value
-       $GLOBALS['action'] = GET_ACTION('guest', $GLOBALS['what']);
+       setAction(getModeAction('guest', getWhat()));
 } // END - if
 
 // Add the guest's menu here...
 if ((getConfig('guest_menu') == 'Y') || (!EXT_IS_ACTIVE('sql_patches', true))) {
        // Show only when guest menu is active
-       ADD_MENU('guest', $GLOBALS['action'], $GLOBALS['what']);
+       ADD_MENU('guest', getAction(), getWhat());
 } // 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;
+enableBlockMode(false);
 
 // Construct FQFN
-$INC = sprintf("inc/modules/guest/action-%s.php", $GLOBALS['action']);
+$INC = sprintf("inc/modules/guest/action-%s.php", getAction());
 
 // Is the file there?
-if ((INCLUDE_READABLE($INC)) && (VALIDATE_MENU_ACTION('guest', $GLOBALS['action'], $GLOBALS['what']))) {
+if ((isIncludeReadable($INC)) && (isMenuActionValid('guest', getAction(), getWhat()))) {
        // 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');
 
 //
 ?>