Commit 6721cb5b by Scott

Remove unnecessary parameters

parent 8bf53b11
...@@ -191,8 +191,8 @@ ...@@ -191,8 +191,8 @@
if ( filter_var($matches[1], FILTER_VALIDATE_IP) && filter_var($matches[2], FILTER_VALIDATE_IP) ) { if ( filter_var($matches[1], FILTER_VALIDATE_IP) && filter_var($matches[2], FILTER_VALIDATE_IP) ) {
if(filter_var($ip, FILTER_VALIDATE_IP,FILTER_FLAG_IPV6)){ if(filter_var($ip, FILTER_VALIDATE_IP,FILTER_FLAG_IPV6)){
$ip=ipv6_expand($ip); $ip=ipv6_expand($ip);
$matches[1]=ipv6_expand($matches[1],true); $matches[1]=ipv6_expand($matches[1]);
$matches[2]=ipv6_expand($matches[2],true); $matches[2]=ipv6_expand($matches[2]);
} }
$iplong=ipv6_numeric($ip); $iplong=ipv6_numeric($ip);
$end1long=ipv6_numeric($matches[1]); $end1long=ipv6_numeric($matches[1]);
...@@ -201,8 +201,8 @@ ...@@ -201,8 +201,8 @@
} }
} elseif (strlen($blockipclause)){ } elseif (strlen($blockipclause)){
if(filter_var($ip, FILTER_VALIDATE_IP,FILTER_FLAG_IPV6)){ if(filter_var($ip, FILTER_VALIDATE_IP,FILTER_FLAG_IPV6)){
$ip=ipv6_expand($ip,true); $ip=ipv6_expand($ip);
$blockipclause=ipv6_expand($blockipclause,true); $blockipclause=ipv6_expand($blockipclause);
} }
return preg_match('/^'.str_replace('\\*', '[0-9a-fA-F]+', preg_quote($blockipclause, '/')).'$/', $ip) > 0; return preg_match('/^'.str_replace('\\*', '[0-9a-fA-F]+', preg_quote($blockipclause, '/')).'$/', $ip) > 0;
// preg_quote misses hyphens but that is OK here // preg_quote misses hyphens but that is OK here
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
$ip=qa_request_part(1); // picked up from qa-page.php $ip=qa_request_part(1); // picked up from qa-page.php
if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4|FILTER_FLAG_IPV6) === false) if (filter_var($ip, FILTER_VALIDATE_IP) === false)
return include QA_INCLUDE_DIR.'qa-page-not-found.php'; return include QA_INCLUDE_DIR.'qa-page-not-found.php';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment