Fix #1468 inconsistent use of REMOTE_ADDR vs. RX_CLIENT_IP

This commit is contained in:
Kijin Sung 2020-11-18 00:17:49 +09:00
parent 996ca166e8
commit 2d6a175b19
11 changed files with 24 additions and 32 deletions

View file

@ -2365,7 +2365,7 @@ class memberController extends member
// check IP access count.
$config = MemberModel::getMemberConfig();
$args = new stdClass();
$args->ipaddress = $_SERVER['REMOTE_ADDR'];
$args->ipaddress = \RX_CLIENT_IP;
// check identifier
if((!$config->identifiers || in_array('email_address', $config->identifiers)) && strpos($user_id, '@') !== false)
@ -2440,7 +2440,7 @@ class memberController extends member
}
else
{
$args->ipaddress = $_SERVER['REMOTE_ADDR'];
$args->ipaddress = \RX_CLIENT_IP;
$output = executeQuery('member.deleteLoginCountByIp', $args);
}
}