X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Flogin.php;h=b308473f7579acab6ae4ff056e11c125a5d282e3;hb=641ca2a3526aa0612781dddf83dd77dbb003adff;hp=5fa5aaf438c8ffcc9aeb79484c959d02799f30de;hpb=5ef6ed7373ae85e5635e39e2a0adf9496a8add05;p=mailer.git

diff --git a/inc/modules/login.php b/inc/modules/login.php
index 5fa5aaf438..b308473f75 100644
--- a/inc/modules/login.php
+++ b/inc/modules/login.php
@@ -32,10 +32,10 @@
  ************************************************************************/
 
 // 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()) {
+} 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);
 	LOAD_URL($URL);
@@ -54,19 +54,14 @@ if ($status != "CONFIRMED") {
 		break;
 
 	default:
+		DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown status %s detected.", $status));
 		$ERROR = CODE_UNKNOWN_STATUS;
 		break;
 	}
-	$URL = URL."/modules.php?module=index&login=".$ERROR;
-	LOAD_URL($URL);
-}
 
-// 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(URL."/modules.php?module=index&login=".$ERROR);
+} // END - if
 
 // Load adverstising template
 define('__MEMBER_ADVERT', LOAD_TEMPLATE("member_banner", true));
@@ -77,47 +72,38 @@ $BLOCK_MODE = false;
 // Generate a tableset for the menu title and content
 LOAD_TEMPLATE("member_header");
 
-// Adding your title's template here...
+// Begin menu block here
 OUTPUT_HTML("<TR>
   <TD class=\"member_menu\">");
 
 // 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
 
+// Menu -> content
 OUTPUT_HTML("   </TD>
   <TD valign=\"top\" align=\"center\" rowspan=\"3\" class=\"member_content\">");
 
-$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_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']))) {
 	// Requested module is available so we load it
 	include ($INC_ACTION);
-}
- else
-{
+} 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("  <BR></TD>
-</TR>
-<TR>
-  <TD align=\"center\" valign=\"top\" class=\"member_advert\">");
+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");