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 89756f98c89ab4307e26d4422b63fea22aa067f0..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                  *
@@ -37,23 +42,23 @@ if (!defined('__SECURITY')) {
        require($INC);
 } 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);
+       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
-       $ERROR = GEN_ERROR_CODE_FROM_ACCOUNT_STATUS($status);
+       $errorCode = GEN_ERROR_CODE_FROM_ACCOUNT_STATUS($status);
 
        // Load URL
-       LOAD_URL("modules.php?module=index&what=login&login=".$ERROR);
+       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");
@@ -78,10 +83,10 @@ if ((getConfig('member_menu') == "Y") || (!EXT_IS_ACTIVE("sql_patches", true)))
 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 = 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);
+       LOAD_INC($INC);
 } else {
        // Invalid module specified or not found...
        LOAD_URL("modules.php?module=login");