fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-26 06:39:56 +09:00
Code Issues Projects Releases Packages Wiki Activity

Refine site lock IP range handling

Browse source
This commit is contained in:
Kijin Sung 2016-02-08 23:02:11 +09:00
parent dcba0bec58
commit 69296b3c8c
1 changed files with 28 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

31
modules/admin/admin.admin.controller.php
View file

@ -662,9 +662,34 @@ class adminAdminController extends admin
$allowed_ip = array_unique(array_filter($allowed_ip, function($item) {
return $item !== '';
}));
if (!in_array(RX_CLIENT_IP, $allowed_ip)) array_unshift($allowed_ip, RX_CLIENT_IP);
if (!in_array('127.0.0.1', $allowed_ip)) array_unshift($allowed_ip, '127.0.0.1');
if (!IpFilter::validate($whitelist)) {
if ($vars->sitelock_locked === 'Y')
{
$allowed_localhost = false;
$allowed_current = false;
foreach ($allowed_ip as $range)
{
if (Rhymix\Framework\IpFilter::inRange('127.0.0.1', $range))
{
$allowed_localhost = true;
}
if (Rhymix\Framework\IpFilter::inRange(RX_CLIENT_IP, $range))
{
$allowed_current = true;
}
}
if (!$allowed_localhost)
{
array_unshift($allowed_ip, '127.0.0.1');
}
if (!$allowed_current)
{
array_unshift($allowed_ip, RX_CLIENT_IP);
}
}
if (!IpFilter::validate($whitelist))
{
return new Object(-1, 'msg_invalid_ip');
}