From d8d24cf1d70351e6c9a8180829273cbd8ebc5e87 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Tue, 02 Jul 2013 15:49:23 -0400
Subject: [PATCH] - Fixed FS#2965 - DNS SOA edit form: xfer validation generates also_notify error message.
---
interface/lib/classes/tform.inc.php | 1 +
interface/web/dns/dns_soa_edit.php | 3 +++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php
index 8e36fb2..20be87b 100644
--- a/interface/lib/classes/tform.inc.php
+++ b/interface/lib/classes/tform.inc.php
@@ -951,6 +951,7 @@
$field_value_array[] = $field_value;
}
foreach($field_value_array as $field_value) {
+ $field_value = trim($field_value);
if(function_exists('filter_var')) {
if(!filter_var($field_value,FILTER_VALIDATE_IP)) {
$errmsg = $validator['errmsg'];
diff --git a/interface/web/dns/dns_soa_edit.php b/interface/web/dns/dns_soa_edit.php
index 5ffa3ac..aba3459 100644
--- a/interface/web/dns/dns_soa_edit.php
+++ b/interface/web/dns/dns_soa_edit.php
@@ -172,6 +172,9 @@
if(stristr($this->dataRecord["mbox"],'@')) {
$this->dataRecord["mbox"] = str_replace('@','.',$this->dataRecord["mbox"]);
}
+
+ $this->dataRecord["xfer"] = preg_replace('/\s+/', '', $this->dataRecord["xfer"]);
+ $this->dataRecord["also_notify"] = preg_replace('/\s+/', '', $this->dataRecord["also_notify"]);
//* Check if a secondary zone with the same name already exists
$tmp = $app->db->queryOneRecord("SELECT count(id) as number FROM dns_slave WHERE origin = \"".$this->dataRecord["origin"]."\" AND server_id = \"".$this->dataRecord["server_id"]."\"");
--
Gitblit v1.9.1