From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/lib/classes/validate_database.inc.php | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/interface/lib/classes/validate_database.inc.php b/interface/lib/classes/validate_database.inc.php
index 0e6ffef..c789b6a 100644
--- a/interface/lib/classes/validate_database.inc.php
+++ b/interface/lib/classes/validate_database.inc.php
@@ -42,17 +42,12 @@
$values = explode(",", $field_value);
foreach($values as $cur_value) {
$cur_value = trim($cur_value);
-
$valid = true;
- if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $cur_value)) {
- $groups = explode(".", $cur_value);
- foreach($groups as $group){
- if($group<0 or $group>255)
- $valid=false;
+ if(function_exists('filter_var')) {
+ if(!filter_var($cur_value, FILTER_VALIDATE_IP)) {
+ $valid = false;
}
- } else {
- $valid = false;
- }
+ } else return "function filter_var missing <br />\r\n";
if($valid == false) {
$errmsg = $validator['errmsg'];
--
Gitblit v1.9.1