X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Flogin.php;h=229c0747c6a46c2fcbb86f9fab4884853dd59875;hb=0226aea588ae0b433e4c2c17b23f79885c2d0da5;hp=b692e3e2cfa1f8252e4d81c7806c1cb89d0e21fd;hpb=c3e061c0d6fc0ee8778ebaebf1c05cf2bf126703;p=mailer.git diff --git a/inc/modules/login.php b/inc/modules/login.php index b692e3e2cf..229c0747c6 100644 --- a/inc/modules/login.php +++ b/inc/modules/login.php @@ -32,41 +32,22 @@ ************************************************************************/ // Some security stuff... -if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) { +if (!defined('__SECURITY')) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); -} elseif (!IS_LOGGED_IN()) { - $URL = URL."/modules.php?module=index"; - if ($check == "mem_only") $URL .= "&msg=".urlencode(LANG_MEM_ONLY_1.$GLOBALS['module'].LANG_MEM_ONLY_2); +} elseif (!IS_MEMBER()) { + $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: - $ERROR = CODE_UNKNOWN_STATUS; - break; - } - $URL = URL."/modules.php?module=index&login=".$ERROR; - LOAD_URL($URL); -} + $ERROR = GEN_ERROR_CODE_FROM_ACCOUNT_STATUS($status); -// Recheck if he got logged out because bad cookies -if (!IS_LOGGED_IN()) -{ - $URL = URL."/modules.php?module=index"; - LOAD_URL($URL); -} + // Load URL + LOAD_URL("modules.php?module=index&what=login&login=".$ERROR); +} // END - if // Load adverstising template define('__MEMBER_ADVERT', LOAD_TEMPLATE("member_banner", true)); @@ -77,54 +58,45 @@ $BLOCK_MODE = false; // Generate a tableset for the menu title and content LOAD_TEMPLATE("member_header"); -// Adding your title's template here... -OUTPUT_HTML("