fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-21 03:12:55 +09:00
Code Issues Projects Releases Packages Wiki Activity

Add inRanges() and validateRanges() methods to IpFilter class

Browse source
This commit is contained in:
Kijin Sung 2016-03-13 10:18:52 +09:00
parent 2effbea06f
commit 0adb13ca30
7 changed files with 52 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

17
modules/admin/admin.admin.view.php
View file

@ -518,24 +518,11 @@ class adminAdminView extends admin
Context::set('sitelock_message', escape(Rhymix\Framework\Config::get('lock.message')));
$allowed_ip = Rhymix\Framework\Config::get('lock.allow') ?: array();
$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)
if (!Rhymix\Framework\IpFilter::inRanges('127.0.0.1', $allowed_ip))
{
array_unshift($allowed_ip, '127.0.0.1');
}
if (!$allowed_current)
if (!Rhymix\Framework\IpFilter::inRanges(RX_CLIENT_IP, $allowed_ip))
{
array_unshift($allowed_ip, RX_CLIENT_IP);
}