X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Flogin.php;h=89756f98c89ab4307e26d4422b63fea22aa067f0;hb=1c484a7c07cd695f22dc8211d9145b73a296ecc4;hp=b308473f7579acab6ae4ff056e11c125a5d282e3;hpb=f9a9c09e1ae257449bfd98f8854e321efba1dc3c;p=mailer.git diff --git a/inc/modules/login.php b/inc/modules/login.php index b308473f75..89756f98c8 100644 --- a/inc/modules/login.php +++ b/inc/modules/login.php @@ -36,31 +36,17 @@ if (!defined('__SECURITY')) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } elseif (!IS_MEMBER()) { - $URL = URL."/modules.php?module=index"; - if ($check == "mem_only") $URL .= "&msg=".urlencode(LANG_MEM_ONLY_1.$GLOBALS['module'].LANG_MEM_ONLY_2); + $URL = "modules.php?module=index"; + if ($check == "mem_only") $URL .= "&msg=".urlencode(LANG_MEM_ONLY_1.$GLOBALS['module'].LANG_MEM_ONLY_2); LOAD_URL($URL); } if ($status != "CONFIRMED") { // If the status is different than confirmed move the user away from here - switch ($status) - { - case "LOCKED": - $ERROR = CODE_ID_LOCKED; - break; - - case "UNCONFIRMED": - $ERROR = CODE_ID_UNCONFIRMED; - break; - - default: - DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown status %s detected.", $status)); - $ERROR = CODE_UNKNOWN_STATUS; - break; - } + $ERROR = GEN_ERROR_CODE_FROM_ACCOUNT_STATUS($status); // Load URL - LOAD_URL(URL."/modules.php?module=index&login=".$ERROR); + LOAD_URL("modules.php?module=index&what=login&login=".$ERROR); } // END - if // Load adverstising template @@ -73,8 +59,8 @@ $BLOCK_MODE = false; LOAD_TEMPLATE("member_header"); // Begin menu block here -OUTPUT_HTML(" - "); +OUTPUT_HTML(" + "); // Adding the main content module here if (empty($GLOBALS['action'])) { @@ -89,8 +75,8 @@ if ((getConfig('member_menu') == "Y") || (!EXT_IS_ACTIVE("sql_patches", true))) } // END - if // Menu -> content -OUTPUT_HTML(" - "); +OUTPUT_HTML(" + "); $INC_ACTION = sprintf("%sinc/modules/member/action-%s.php", PATH, $act); if ((FILE_READABLE($INC_ACTION)) && (VALIDATE_MENU_ACTION("member", GET_ACTION("member", $GLOBALS['what']), $GLOBALS['what']))) { @@ -109,8 +95,8 @@ if ((getConfig('member_menu') == "Y") || (!EXT_IS_ACTIVE("sql_patches", true))) LOAD_TEMPLATE("member_advert"); } -OUTPUT_HTML(" -"); +OUTPUT_HTML(" +"); // Load same template for "Goto TOP" LOAD_TEMPLATE("member_goto_top");