X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Flogin.php;h=a8cf8861d3e378ac09fa9814e44cb503a476be9a;hb=414570c5081d337bb6c28dcf521bd8bca02f69e7;hp=e7e2d3581037dde46eb1efb8cdcc7f50aa80b36b;hpb=75ad748a68473ace540251427a74fb781b1145e9;p=mailer.git diff --git a/inc/modules/login.php b/inc/modules/login.php index e7e2d35810..a8cf8861d3 100644 --- a/inc/modules/login.php +++ b/inc/modules/login.php @@ -10,7 +10,12 @@ * -------------------------------------------------------------------- * * Kurzbeschreibung : Login-Bereich fuer Mitglieder * * -------------------------------------------------------------------- * - * * + * $Revision:: 856 $ * + * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009) $ * + * $Tag:: 0.2.1-FINAL $ * + * $Author:: stelzi $ * + * Needs to be in all Files and every File needs "svn propset * + * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2008 by Roland Haeder * * For more information visit: http://www.mxchange.org * @@ -32,99 +37,71 @@ ************************************************************************/ // 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)); // Disable block mode by default -$BLOCK_MODE = false; +$GLOBALS['block_mode'] = false; // Generate a tableset for the menu title and content LOAD_TEMPLATE("member_header"); -// Adding your title's template here... -OUTPUT_HTML (" - "); +// Begin menu block here +OUTPUT_HTML(" + "); // Adding the main content module here -if (empty($GLOBALS['action'])) -{ +if (empty($GLOBALS['action'])) { if (empty($GLOBALS['what'])) $GLOBALS['what'] = "welcome"; -} - else -{ +} else { $act = SQL_ESCAPE($GLOBALS['action']); } // Add the member's menu here... -if (($CONFIG['member_menu'] == "Y") || (!EXT_IS_ACTIVE("sql_patches", true))) -{ +if ((getConfig('member_menu') == "Y") || (!EXT_IS_ACTIVE("sql_patches", true))) { ADD_MENU("member", GET_ACTION("member", $GLOBALS['what']), $GLOBALS['what']); -} +} // END - if -OUTPUT_HTML (" - "); +// Menu -> content +OUTPUT_HTML(" + "); -$INC_ACTION = sprintf(PATH."inc/modules/member/action-%s.php", $act); -if ((file_exists($INC_ACTION)) && (is_readable($INC_ACTION)) && (VALIDATE_MENU_ACTION("member", GET_ACTION("member", $GLOBALS['what']), $GLOBALS['what']))) -{ +$INC = sprintf("inc/modules/member/action-%s.php", $act); +if ((INCLUDE_READABLE($INC)) && (VALIDATE_MENU_ACTION("member", $GLOBALS['action'], $GLOBALS['what']))) { // Requested module is available so we load it - include ($INC_ACTION); -} - else -{ + LOAD_INC($INC); +} else { // Invalid module specified or not found... LOAD_URL("modules.php?module=login"); } -if (($CONFIG['member_menu'] == "Y") || (!EXT_IS_ACTIVE("sql_patches", true))) -{ - OUTPUT_HTML ("
- - - "); +if ((getConfig('member_menu') == "Y") || (!EXT_IS_ACTIVE("sql_patches", true))) { + // Right side of content (hint: a good place for 120x600 skyscraper banner!) + LOAD_TEMPLATE("member_content_right"); // Some advertising stuff? LOAD_TEMPLATE("member_advert"); } -OUTPUT_HTML (" -"); +OUTPUT_HTML(" +"); // Load same template for "Goto TOP" LOAD_TEMPLATE("member_goto_top");