Fix for if session has expired and user is still in login area

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

diff --git a/inc/modules/login.php b/inc/modules/login.php
index 40dbcc5e24803b7535756a9795de6a433b4226d4..06c4ffb97b7eef26451804c53eada28a86c7020b 100644 (file)
--- a/inc/modules/login.php
+++ b/inc/modules/login.php
@@ -42,23 +42,23 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        $URL = 'modules.php?module=index';
-       if ($check == 'mem_only') $URL .= '&msg='.getCode('MODULE_MEM_ONLY').'&mod='.$GLOBALS['module'];
-       LOAD_URL($URL);
+       if (checkModulePermissions('login') == 'mem_only') $URL .= '&msg='.getCode('MODULE_MEM_ONLY') . '&mod='.getModule();
+       redirectToUrl($URL);
 }
 
-if ($status != 'CONFIRMED') {
+if ($GLOBALS['status'] != 'CONFIRMED') {
        // If the status is different than confirmed move the user away from here
-       $errorCode = GEN_ERROR_CODE_FROM_ACCOUNT_STATUS($status);
+       $errorCode = generateErrorCodeFromUserStatus($GLOBALS['status']);
 
        // Load URL
-       LOAD_URL('modules.php?module=index&what=login&login='.$errorCode);
+       redirectToUrl('modules.php?module=index&what=login&login=' . $errorCode);
 } // END - if
 
 // Load adverstising template
 define('__MEMBER_ADVERT', LOAD_TEMPLATE('member_banner', true));
 
 // Disable block mode by default
-$GLOBALS['block_mode'] = false;
+enableBlockMode(false);
 
 // Generate a tableset for the menu title and content
 LOAD_TEMPLATE('member_header');
@@ -68,28 +68,31 @@ OUTPUT_HTML("<tr>
   <td class=\"member_menu\">");
 
 // Adding the main content module here
-if (empty($GLOBALS['action'])) {
-       if (empty($GLOBALS['what'])) $GLOBALS['what'] = 'welcome';
+if (!isActionSet()) {
+       if (!isWhatSet()) setWhat('welcome');
 } else {
-       $act = SQL_ESCAPE($GLOBALS['action']);
+       $act = getAction();
 }
 
 // Add the member's menu here...
 if ((getConfig('member_menu') == 'Y') || (!EXT_IS_ACTIVE('sql_patches', true))) {
-       ADD_MENU('member', GET_ACTION('member', $GLOBALS['what']), $GLOBALS['what']);
+       ADD_MENU('member', getModeAction('member', getWhat()), getWhat());
 } // END - if
 
+// Disable block-mode again
+enableBlockMode(false);
+
 // Menu -> content
 OUTPUT_HTML("   </td>
   <td valign=\"top\" align=\"center\" rowspan=\"3\" class=\"member_content\">");
 
 $INC = sprintf("inc/modules/member/action-%s.php", $act);
-if ((INCLUDE_READABLE($INC)) && (VALIDATE_MENU_ACTION('member', $GLOBALS['action'], $GLOBALS['what']))) {
+if ((isIncludeReadable($INC)) && (isMenuActionValid('member', getAction(), getWhat()))) {
        // Requested module is available so we load it
-       LOAD_INC($INC);
+       loadInclude($INC);
 } else {
        // Invalid module specified or not found...
-       LOAD_URL('modules.php?module=login');
+       redirectToUrl('modules.php?module=login');
 }
 
 if ((getConfig('member_menu') == 'Y') || (!EXT_IS_ACTIVE('sql_patches', true))) {