X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Flogin.php;h=9ca58e5f02d8f8b16c17f742753cf0865aaf059c;hp=8178d82f09903ac10e1da21162e5aab9b32f12ed;hb=f7f6e55ee0d90558ad773ce6168767c0af816696;hpb=e8a44f28a734e4796b70a1bc9df353f2466e1846

diff --git a/inc/modules/login.php b/inc/modules/login.php
index 8178d82f09..9ca58e5f02 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);
@@ -59,14 +59,13 @@ if ($status != "CONFIRMED") {
 	}
 	$URL = URL."/modules.php?module=index&login=".$ERROR;
 	LOAD_URL($URL);
-}
+} // END - if
 
 // Recheck if he got logged out because bad cookies
-if (!IS_LOGGED_IN())
-{
+if (!IS_MEMBER()) {
 	$URL = URL."/modules.php?module=index";
 	LOAD_URL($URL);
-}
+} // END - if
 
 // Load adverstising template
 define('__MEMBER_ADVERT', LOAD_TEMPLATE("member_banner", true));
@@ -77,7 +76,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\">");
 
@@ -91,13 +90,14 @@ if (empty($GLOBALS['action'])) {
 // Add the member's menu here...
 if (($_CONFIG['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 {
@@ -105,8 +105,7 @@ 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)))
-{
+if (($_CONFIG['member_menu'] == "Y") || (!EXT_IS_ACTIVE("sql_patches", true))) {
 	OUTPUT_HTML("  <br /></TD>
 </TR>
 <TR>