More globals rewritten, see ticket #100

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

diff --git a/inc/modules/login.php b/inc/modules/login.php
index b692e3e2cfa1f8252e4d81c7806c1cb89d0e21fd..f06e6bac8f27d1f8e133a96a5b33d4a31630786d 100644 (file)
--- a/inc/modules/login.php
+++ b/inc/modules/login.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Login-Bereich fuer Mitglieder                    *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -32,99 +37,71 @@
  ************************************************************************/
 
 // 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=".getCode('MODULE_MEM_ONLY')."&mod=".$GLOBALS['module'];
        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);
-}
+       $errorCode = 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=".$errorCode);
+} // END - if
 
 // Load adverstising template
 define('__MEMBER_ADVERT', LOAD_TEMPLATE("member_banner", true));
 
 // Disable block mode by default
-$BLOCK_MODE = false;
+$GLOBALS['block_mode'] = false;
 
 // Generate a tableset for the menu title and content
 LOAD_TEMPLATE("member_header");
 
-// Adding your title's template here...
-OUTPUT_HTML("<TR>
-  <TD class=\"member_menu\">");
+// 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
 
-OUTPUT_HTML("   </TD>
-  <TD valign=\"top\" align=\"center\" rowspan=\"3\" class=\"member_content\">");
+// 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 = sprintf("inc/modules/member/action-%s.php", $act);
+if ((INCLUDE_READABLE($INC)) && (VALIDATE_MENU_ACTION("member", $GLOBALS['action'], $GLOBALS['what']))) {
        // Requested module is available so we load it
-       include ($INC_ACTION);
-}
- else
-{
+       LOAD_INC($INC);
+} 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");