New naming convention applied to many functions, see #118 for details

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

diff --git a/inc/modules/login.php b/inc/modules/login.php
index 40dbcc5e24803b7535756a9795de6a433b4226d4..eb333e70ceec20b46565b6fe537c3669c237b632 100644 (file)
--- a/inc/modules/login.php
+++ b/inc/modules/login.php
@@ -43,15 +43,15 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        $URL = 'modules.php?module=index';
        if ($check == 'mem_only') $URL .= '&msg='.getCode('MODULE_MEM_ONLY').'&mod='.$GLOBALS['module'];
-       LOAD_URL($URL);
+       redirectToUrl($URL);
 }
 
 if ($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($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
@@ -76,7 +76,7 @@ if (empty($GLOBALS['action'])) {
 
 // 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', $GLOBALS['what']), $GLOBALS['what']);
 } // END - if
 
 // Menu -> content
@@ -84,12 +84,12 @@ 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', $GLOBALS['action'], $GLOBALS['what']))) {
        // 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))) {