Naming inconsistencies for userid fixed

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

diff --git a/inc/modules/chk_login.php b/inc/modules/chk_login.php
index 3014e87d8d85c3bbf9e6589e4cb5f270e78eabf1..e87de7dbf4912673cb6acfc985f13657caf62eaf 100644 (file)
--- a/inc/modules/chk_login.php
+++ b/inc/modules/chk_login.php
@@ -44,13 +44,13 @@ if (!defined('__SECURITY')) {
 // Initial message part
 $message = "<strong>{--VALIDATING_LOGIN--}</strong>";
 
-if (isUserIdSet() && (isSessionVariableSet('u_hash'))) {
+if (isMemberIdSet() && (isSessionVariableSet('u_hash'))) {
        // Is 'theme' installed and activated?
        if (isExtensionActive('theme')) {
                // Get theme from profile
-               if (!fetchUserData(getUserId())) {
+               if (!fetchUserData(getMemberId())) {
                        // Userid is not valid
-                       debug_report_bug('User id '.getUserId() . ' is invalid.');
+                       debug_report_bug('User id '.getMemberId() . ' is invalid.');
                } // END - if
 
                // Load data
@@ -70,7 +70,7 @@ SET
 WHERE
        `userid`=%s
 LIMIT 1",
-                               array(getUserId()), __FILE__, __LINE__);
+                               array(getMemberId()), __FILE__, __LINE__);
 
                        // Store it in session
                        setSession('mxchange_member_failures', $data['login_failures']);
@@ -91,7 +91,7 @@ WHERE
        `last_login` < (UNIX_TIMESTAMP() - %s)
 LIMIT 1",
                        array(
-                               getUserId(),
+                               getMemberId(),
                                getConfig('login_timeout')
                        ), __FILE__, __LINE__
                );