More globals rewritten, see #100

[mailer.git] / inc / libs / user_functions.php

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 7c747ddf57a96cf896d6fd92480c9759bd80490c..05d43f9a84d1d829cf554a258301afbd762e6b9b 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -257,22 +257,22 @@ function SELECT_RANDOM_REFID () {
 // Do the user login
 function USER_DO_LOGIN ($uid, $passwd) {
        // Add last_login if available
-       $LAST = "";
+       $lastOnline = "";
        if (GET_EXT_VERSION("sql_patches") >= "0.2.8") {
-               $LAST = ", last_login";
+               $lastOnline = ", last_login";
        } // END - if
 
        // Check login data
        $password = ""; $uid2 = ""; $dmy = ""; $online = 0; $login = 0;
        if ((EXT_IS_ACTIVE("nickname")) && (NICKNAME_PROBE_ON_USERID($uid))) {
                // Nickname entered
-               $result = SQL_QUERY_ESC("SELECT userid, password, last_online".$LAST." FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nickname='%s' AND `status`='CONFIRMED' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT userid, password, last_online".$lastOnline." FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nickname='%s' AND `status`='CONFIRMED' LIMIT 1",
                        array($uid), __FILE__, __LINE__);
                list($uid2, $password, $online, $login) = SQL_FETCHROW($result);
                if (!empty($uid2)) $uid = bigintval($uid2);
        } else {
                // Direct userid entered
-               $result = SQL_QUERY_ESC("SELECT userid, password, last_online".$LAST." FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND `status`='CONFIRMED' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT userid, password, last_online".$lastOnline." FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND `status`='CONFIRMED' LIMIT 1",
                        array($uid, $hash), __FILE__, __LINE__);
                list($uid2, $password, $online, $login) = SQL_FETCHROW($result);
        }
@@ -346,11 +346,11 @@ function USER_DO_LOGIN ($uid, $passwd) {
                                        }
                                } else {
                                        // Cannot update counter!
-                                       $URL = "modules.php?module=index&what=login&login=".CODE_CNTR_FAILED;
+                                       $URL = "modules.php?module=index&what=login&login=".constant('CODE_CNTR_FAILED');
                                }
                        } else {
                                // Cookies not setable!
-                               $URL = "modules.php?module=index&what=login&login=".CODE_NO_COOKIES;
+                               $URL = "modules.php?module=index&what=login&login=".constant('CODE_NO_COOKIES');
                        }
                } elseif (GET_EXT_VERSION("sql_patches") >= "0.6.1") {
                        // Update failture counter
@@ -358,7 +358,7 @@ function USER_DO_LOGIN ($uid, $passwd) {
                                array($uid), __FILE__, __LINE__);
 
                        // Wrong password!
-                       $URL = "modules.php?module=index&what=login&login=".CODE_WRONG_PASS;
+                       $URL = "modules.php?module=index&what=login&login=".constant('CODE_WRONG_PASS');
                }
        } elseif ((($probe_nickname) && (!empty($uid2))) || ($uid2 == $uid)) {
                // Other account status?