'userid' rewritten to functions

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

diff --git a/inc/modules/chk_login.php b/inc/modules/chk_login.php
index 2fe52f798660309a1cf46b857e7bbcbe921f9d1e..a2bce2d724edc4e37c399e4b03db5566581d036a 100644 (file)
--- a/inc/modules/chk_login.php
+++ b/inc/modules/chk_login.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
 // Initial message part
 $MSG = "<strong>{--VALIDATING_LOGIN--}</strong>";
 
-if (!empty($GLOBALS['userid']) && (isSessionVariableSet('u_hash'))) {
+if (isUserIdSet() && (isSessionVariableSet('u_hash'))) {
        // Login failures are supported since 0.4.7
        // Do we have 0.4.7 of sql_patches or later?
        $ADD = "";
@@ -56,7 +56,7 @@ if (!empty($GLOBALS['userid']) && (isSessionVariableSet('u_hash'))) {
 
        // Get theme from profile
        $result = SQL_QUERY_ESC("SELECT curr_theme".$ADD." FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-               array($GLOBALS['userid']), __FILE__, __LINE__);
+               array(getUserId()), __FILE__, __LINE__);
 
        // Load data
        $data = SQL_FETCHARRAY($result);
@@ -74,7 +74,7 @@ if (!empty($GLOBALS['userid']) && (isSessionVariableSet('u_hash'))) {
 SET login_failures=0, last_failure='0000-00-00 00:00:00'
 WHERE userid=%s
 LIMIT 1",
-                       array($GLOBALS['userid']), __FILE__, __LINE__);
+                       array(getUserId()), __FILE__, __LINE__);
 
                // Store it in session
                set_session('mxchange_member_failures', $data['login_failures']);
@@ -90,7 +90,7 @@ SET last_login=UNIX_TIMESTAMP()
 WHERE userid=%s AND last_login < (UNIX_TIMESTAMP() - %s)
 LIMIT 1",
                        array(
-                               $GLOBALS['userid'],
+                               getUserId(),
                                getConfig('login_timeout')
                        ), __FILE__, __LINE__
                );