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

Move IpFilter class to Security namespace

Browse source
This commit is contained in:
Kijin Sung 2016-03-13 10:24:52 +09:00
parent 0adb13ca30
commit 544170b530
10 changed files with 94 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -587,7 +587,7 @@ class adminAdminController extends admin
$allowed_ip = array_unique(array_filter($allowed_ip, function($item) {
return $item !== '';
}));
if (!Rhymix\Framework\IpFilter::validateRanges($allowed_ip)) {
if (!Rhymix\Framework\Security\IpFilter::validateRanges($allowed_ip)) {
return new Object(-1, 'msg_invalid_ip');
}
@ -595,7 +595,7 @@ class adminAdminController extends admin
$denied_ip = array_unique(array_filter($denied_ip, function($item) {
return $item !== '';
}));
if (!Rhymix\Framework\IpFilter::validateRanges($denied_ip)) {
if (!Rhymix\Framework\Security\IpFilter::validateRanges($denied_ip)) {
return new Object(-1, 'msg_invalid_ip');
}
@ -745,7 +745,7 @@ class adminAdminController extends admin
$allowed_ip = array_unique(array_filter($allowed_ip, function($item) {
return $item !== '';
}));
if (!IpFilter::validate($whitelist)) {
if (!Rhymix\Framework\Security\IpFilter::validate($allowed_ip)) {
return new Object(-1, 'msg_invalid_ip');
}
Rhymix\Framework\Config::set('debug.allow', array_values($allowed_ip));
@ -771,17 +771,17 @@ class adminAdminController extends admin
if ($vars->sitelock_locked === 'Y')
{
if (!Rhymix\Framework\IpFilter::inRanges('127.0.0.1', $allowed_ip))
if (!Rhymix\Framework\Security\IpFilter::inRanges('127.0.0.1', $allowed_ip))
{
array_unshift($allowed_ip, '127.0.0.1');
}
if (!Rhymix\Framework\IpFilter::inRanges(RX_CLIENT_IP, $allowed_ip))
if (!Rhymix\Framework\Security\IpFilter::inRanges(RX_CLIENT_IP, $allowed_ip))
{
array_unshift($allowed_ip, RX_CLIENT_IP);
}
}
if (!Rhymix\Framework\IpFilter::validateRanges($allowed_ip))
if (!Rhymix\Framework\Security\IpFilter::validateRanges($allowed_ip))
{
return new Object(-1, 'msg_invalid_ip');
}