From 64604dedaf7ff5c86db5e5e7d82de62ba3a1df2c Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 11 Nov 2015 09:07:53 -0500
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/lib/classes/validate_database.inc.php | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/interface/lib/classes/validate_database.inc.php b/interface/lib/classes/validate_database.inc.php
index e348afe..b12405f 100644
--- a/interface/lib/classes/validate_database.inc.php
+++ b/interface/lib/classes/validate_database.inc.php
@@ -42,19 +42,19 @@
$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)) {
- if(preg_match("/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/", $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($field_value, FILTER_VALIDATE_IP)) {
+ $valid = false;
}
} else {
- $valid = false;
+ if(
+ !preg_match("/^[0-9a-f]{1,4}:([0-9a-f]{0,4}:){1,6}[0-9a-f]{1,4}$/", $cur_value)
+ &&
+ !preg_match("/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/", $cur_value)) {
+ $valid = false;
+ }
}
-
if($valid == false) {
$errmsg = $validator['errmsg'];
if(isset($app->tform->wordbook[$errmsg])) {
--
Gitblit v1.9.1