From eabf23d38491aed648bfa22df18230f2f49be1cd Mon Sep 17 00:00:00 2001
From: Guillaume Mazoyer <respawneral@gmail.com>
Date: Tue, 5 Aug 2014 01:52:02 +0200
Subject: Add a way to validate strict IP address (no mask).

---
 utils.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'utils.php')

diff --git a/utils.php b/utils.php
index 99a6a06..b6fc061 100644
--- a/utils.php
+++ b/utils.php
@@ -21,8 +21,8 @@
 
 require_once 'config.php';
 
-function match_ipv4($ip) {
-  if (strrpos($ip, '/'))  {
+function match_ipv4($ip, $ip_only = true) {
+  if (strrpos($ip, '/') && !$ip_only)  {
     $ip_and_mask = explode('/', $ip, 2);
 
     return filter_var($ip_and_mask[0], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) &&
@@ -32,8 +32,8 @@ function match_ipv4($ip) {
   }
 }
 
-function match_ipv6($ip) {
-  if (strrpos($ip, '/'))  {
+function match_ipv6($ip, $ip_only = true) {
+  if (strrpos($ip, '/') && !$ip_only)  {
     $ip_and_mask = explode('/', $ip, 2);
 
     return filter_var($ip_and_mask[0], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) &&
-- 
cgit v1.2.3