Functions imported, some dev-scripts added

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

diff --git a/inc/modules/login.php b/inc/modules/login.php
index 9ca58e5f02d8f8b16c17f742753cf0865aaf059c..229c0747c6a46c2fcbb86f9fab4884853dd59875 100644 (file)
--- a/inc/modules/login.php
+++ b/inc/modules/login.php
@@ -36,35 +36,17 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } 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);
+       $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_MEMBER()) {
-       $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
@@ -77,8 +59,8 @@ $BLOCK_MODE = false;
 LOAD_TEMPLATE("member_header");
 
 // Begin menu block here
-OUTPUT_HTML("<TR>
-  <TD class=\"member_menu\">");
+OUTPUT_HTML("<tr>
+  <td class=\"member_menu\">");
 
 // Adding the main content module here
 if (empty($GLOBALS['action'])) {
@@ -88,35 +70,33 @@ 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\">");
+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_READABLE($INC_ACTION)) && (VALIDATE_MENU_ACTION("member", GET_ACTION("member", $GLOBALS['what']), $GLOBALS['what']))) {
+$INC_ACTION = sprintf("inc/modules/member/action-%s.php", $act);
+if ((FILE_READABLE($INC_ACTION)) && (VALIDATE_MENU_ACTION("member", $GLOBALS['action'], $GLOBALS['what']))) {
        // Requested module is available so we load it
-       include ($INC_ACTION);
+       LOAD_INC($INC_ACTION);
 } 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");
 }
 
-OUTPUT_HTML("  </TD>
-</TR>");
+OUTPUT_HTML("  </td>
+</tr>");
 
 // Load same template for "Goto TOP"
 LOAD_TEMPLATE("member_goto_top");