X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Flogin.php;h=ba29320e8878d742310f5cf2eb60558a5cb84b0a;hb=e71e9e1380d65ccd06beef6fbc594bec10371f5f;hp=8c493c055b609584b2671f0577304151d51bab26;hpb=c45b1827a16928c65ecc1aea6a9d7a504c4874d4;p=mailer.git

diff --git a/inc/modules/login.php b/inc/modules/login.php
index 8c493c055b..ba29320e88 100644
--- a/inc/modules/login.php
+++ b/inc/modules/login.php
@@ -32,39 +32,21 @@
  ************************************************************************/
 
 // 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);
-} // END - if
+	$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
@@ -76,7 +58,7 @@ $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\">");
 
@@ -88,15 +70,16 @@ if (empty($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("%sinc/modules/member/action-%s.php", PATH, $act);
-if ((file_exists($INC_ACTION)) && (is_readable($INC_ACTION)) && (VALIDATE_MENU_ACTION("member", GET_ACTION("member", $GLOBALS['what']), $GLOBALS['what']))) {
+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 {
@@ -104,12 +87,9 @@ if ((file_exists($INC_ACTION)) && (is_readable($INC_ACTION)) && (VALIDATE_MENU_A
 	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");