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 93b3faa943a27f5c197215fe358483532ec8627e..7c13b54fa4124644645ea50832c5a56b39f5f89e 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!
-       redirectToUrl('admin.php');
+       redirectToUrl('modules.php?module=admin&ext_missing=sql_patches');
 }
 
 // Load adverstising template
@@ -58,31 +58,31 @@ handleCodeMessage();
 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'] = getModeAction('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');
 
 // 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 ((isIncludeReadable($INC)) && (isMenuActionValid('guest', $GLOBALS['action'], $GLOBALS['what']))) {
+if ((isIncludeReadable($INC)) && (isMenuActionValid('guest', getAction(), getWhat()))) {
        // Requested module is available so we load it
        loadIncludeOnce($INC);
 } else {