More globals rewritten, see ticket #100

[mailer.git] / inc / modules / guest / what-login.php

diff --git a/inc/modules/guest/what-login.php b/inc/modules/guest/what-login.php
index 5f59096e776a2d33a05b6a127462b30891560700..bcea77ddb74a573b2211d33112a8967fad3c92f7 100644 (file)
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -11,7 +11,12 @@
  * Kurzbeschreibung  : Loginbereich (leitet an das richtige Lgin-Modul  *
  *                     weiter)                                          *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $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                  *
@@ -44,20 +49,20 @@ if (!defined('__SECURITY')) {
 // Add description as navigation point
 ADD_DESCR("guest", __FILE__);
 
-global $DATA, $ERROR;
+global $DATA;
 
 // Initialize variables
-$ERROR = 0;
+$errorCode = 0;
 $probe_nickname = false;
 $uid = false;
 $hash = "";
 $URL = "";
-$ADD = "";
+$add = "";
 
 // Already logged in?
-if ((!empty($GLOBALS['userid'])) && (isSessionVariableSet('u_hash'))) {
+if ((isUserIdSet()) && (isSessionVariableSet('u_hash'))) {
        // Maybe, then continue with it
-       $uid = $GLOBALS['userid'];
+       $uid = getUserId();
 } elseif ((REQUEST_ISSET_POST(('id'))) && (REQUEST_ISSET_POST(('password'))) && (IS_FORM_SENT())) {
        // Set userid and crypt password when login data was submitted
        if ((EXT_IS_ACTIVE("nickname")) && (NICKNAME_PROBE_ON_USERID(REQUEST_POST('id')))) {
@@ -85,68 +90,68 @@ if (IS_MEMBER()) {
        $URL = "modules.php?module=login";
 } elseif ((IS_FORM_SENT()) && ("".$uid."" != "".REQUEST_POST('id')."")) {
        // Invalid input (no nickname extension installed but nickname entered)
-       $ERROR = constant('CODE_EXTENSION_PROBLEM');
+       $errorCode = getCode('EXTENSION_PROBLEM');
 } elseif (IS_FORM_SENT()) {
        // Try the login (see inc/libs/user_functions.php)
        $URL = USER_DO_LOGIN(REQUEST_POST('id'), REQUEST_POST('password'));
 } elseif ((REQUEST_ISSET_POST(('new_pass'))) && (isset($uid))) {
        // Try the userid/email lookup (see inc/libs/user_functions.php)
-       $ERROR = USER_DO_NEW_PASSWORD(REQUEST_POST('email'), $uid);
+       $errorCode = USER_DO_NEW_PASSWORD(REQUEST_POST('email'), $uid);
 }
 
 // Login problems?
 if (REQUEST_ISSET_GET(('login'))) {
        // Use code from URL
-       $ERROR = REQUEST_GET(('login'));
+       $errorCode = REQUEST_GET(('login'));
 } // END  - if
 
 // Login problems?
-if (!empty($ERROR)) {
+if (!empty($errorCode)) {
        // Ok, which one now?
-       $MSG = "<tr>
+       $message = "<tr>
   <td width=\"10\" class=\"seperator\">&nbsp;</td>
   <td colspan=\"7\" align=\"center\">
     <span class=\"guest_failed\">";
 
-       switch ($ERROR) {
-               case constant('CODE_WRONG_PASS'):
-                       $MSG .= getMessage('LOGIN_WRONG_PASS');
+       switch ($errorCode) {
+               case getCode('WRONG_PASS'):
+                       $message .= getMessage('LOGIN_WRONG_PASS');
                        break;
 
-               case constant('CODE_WRONG_ID'):
-                       $MSG .= getMessage('LOGIN_WRONG_ID');
+               case getCode('WRONG_ID'):
+                       $message .= getMessage('LOGIN_WRONG_ID');
                        break;
 
-               case constant('CODE_ID_LOCKED'):
-                       $MSG .= getMessage('LOGIN_ID_LOCKED');
+               case getCode('ID_LOCKED'):
+                       $message .= getMessage('LOGIN_ID_LOCKED');
                        break;
 
-               case constant('CODE_ID_UNCONFIRMED'):
-                       $MSG .= getMessage('LOGIN_ID_UNCONFIRMED');
+               case getCode('ID_UNCONFIRMED'):
+                       $message .= getMessage('LOGIN_ID_UNCONFIRMED');
                        break;
 
-               case constant('CODE_NO_COOKIES'):
-                       $MSG .= getMessage('LOGIN_NO_COOKIES');
+               case getCode('NO_COOKIES'):
+                       $message .= getMessage('LOGIN_NO_COOKIES');
                        break;
 
-               case constant('CODE_EXTENSION_PROBLEM'):
+               case getCode('EXTENSION_PROBLEM'):
                        if (IS_ADMIN()) {
-                               $MSG .= sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), "nickname");
+                               $message .= sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), "nickname");
                        } else {
-                               $MSG .= getMessage('LOGIN_WRONG_ID');
+                               $message .= getMessage('LOGIN_WRONG_ID');
                        }
                        break;
 
                default:
-                       DEBUG_LOG(__FILE__, __LINE__, sprintf("Unhandled error code %s detected.", $ERROR));
-                       $MSG .= getMessage('LOGIN_WRONG_ID');
+                       DEBUG_LOG(__FILE__, __LINE__, sprintf("Unhandled error code %s detected.", $errorCode));
+                       $message .= getMessage('LOGIN_WRONG_ID');
                        break;
                }
-               $MSG .= "</span>
+               $message .= "</span>
   </td>
   <td width=\"10\" class=\"seperator\">&nbsp;</td>
 </tr>\n";
-               define('LOGIN_FAILURE_MSG', $MSG);
+               define('LOGIN_FAILURE_MSG', $message);
 } else {
        // No problems, no output
        define('LOGIN_FAILURE_MSG', "");