Several bugfixes, getMessage() introduced

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

diff --git a/inc/modules/index.php b/inc/modules/index.php
index 1ac4b9912201c555477ac536573a69c6802d4e8e..6180e3e9416df571a71fffe6e163713f1bb3fc0b 100644 (file)
--- a/inc/modules/index.php
+++ b/inc/modules/index.php
@@ -35,7 +35,7 @@
 if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
-} elseif (!EXT_IS_ACTIVE("sql_patches", true)) {
+} elseif ((!EXT_IS_ACTIVE("sql_patches", true)) && (!IS_ADMIN())) {
        // The extension "sql_patches" *MUST* be activated or you have lot's of problems!
        LOAD_URL("modules.php?module=admin");
 }
@@ -87,19 +87,19 @@ if (!empty($_GET['msg'])) {
 LOAD_TEMPLATE("guest_menu_td");
 
 // When no what value is provided take the "home" value
-if (empty($GLOBALS['what'])) $GLOBALS['what'] = $_CONFIG['index_home'];
+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
-       $act = GET_ACTION("guest", $GLOBALS['what']);
-} else {
-       // Get action value directly from URL
-       $act = COMPILE_CODE($GLOBALS['action']);
-}
+       $GLOBALS['action'] = GET_ACTION("guest", $GLOBALS['what']);
+} // END - if
+
+// Get action value directly from URL
+$act = COMPILE_CODE($GLOBALS['action']);
 
 // Add the guest's menu here...
-if (($_CONFIG['guest_menu'] == "Y") || (!EXT_IS_ACTIVE("sql_patches", true))) {
+if ((getConfig('guest_menu') == "Y") || (!EXT_IS_ACTIVE("sql_patches", true))) {
        // Show only when guest menu is active
        ADD_MENU("guest", $act, $GLOBALS['what']);
 } // END - if
@@ -119,7 +119,7 @@ if ((FILE_READABLE($INC_ACTION)) && (VALIDATE_MENU_ACTION("guest", $act, $GLOBAL
        LOAD_URL("modules.php?module=index");
 }
 
-if (($_CONFIG['guest_menu'] == "Y") || (!EXT_IS_ACTIVE("sql_patches", true))) {
+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");