More fixes for extension loader / broken cache files

[mailer.git] / inc / modules / login.php

diff --git a/inc/modules/login.php b/inc/modules/login.php
index 63871f1ecdab71bffb6f51eee62bd24863ea6d4e..cdf0e72676539a3cdb7ef6e8299c01367b6a916b 100644 (file)
--- 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,17 +54,13 @@ 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);
-} // END - if
 
-// 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
@@ -76,7 +72,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\">");
 
@@ -90,8 +86,9 @@ 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\">");
 
@@ -104,12 +101,9 @@ if ((FILE_READABLE($INC_ACTION)) && (VALIDATE_MENU_ACTION("member", GET_ACTION("
        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 (($_CONFIG['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");