From 25242a2179460ff51f275ce85ce7d6a771ef467b Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Tue, 01 Nov 2011 09:17:27 -0400
Subject: [PATCH] - DNS/Import zone file: fixed problem with double quotes around TXT records.
---
interface/web/dns/dns_import.php | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/interface/web/dns/dns_import.php b/interface/web/dns/dns_import.php
index 8ad3275..3aaaf3f 100644
--- a/interface/web/dns/dns_import.php
+++ b/interface/web/dns/dns_import.php
@@ -256,6 +256,12 @@
$dns_rr[$r]['aux'] = intval($parts[$pkey+1]);
$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2));
break;
+ case 'txt':
+ $dns_rr[$r]['aux'] = 0;
+ $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
+ if(substr($dns_rr[$r]['data'],0,1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],1);
+ if(substr($dns_rr[$r]['data'],-1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],0,-1);
+ break;
default:
$dns_rr[$r]['aux'] = 0;
$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
@@ -273,6 +279,12 @@
case 'srv':
$dns_rr[$r]['aux'] = intval($parts[$pkey+1]);
$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2));
+ break;
+ case 'txt':
+ $dns_rr[$r]['aux'] = 0;
+ $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
+ if(substr($dns_rr[$r]['data'],0,1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],1);
+ if(substr($dns_rr[$r]['data'],-1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],0,-1);
break;
default:
$dns_rr[$r]['aux'] = 0;
@@ -292,6 +304,12 @@
$dns_rr[$r]['aux'] = intval($parts[$pkey+1]);
$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2));
break;
+ case 'txt':
+ $dns_rr[$r]['aux'] = 0;
+ $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
+ if(substr($dns_rr[$r]['data'],0,1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],1);
+ if(substr($dns_rr[$r]['data'],-1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],0,-1);
+ break;
default:
$dns_rr[$r]['aux'] = 0;
$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
@@ -309,6 +327,12 @@
case 'srv':
$dns_rr[$r]['aux'] = intval($parts[$pkey+1]);
$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2));
+ break;
+ case 'txt':
+ $dns_rr[$r]['aux'] = 0;
+ $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
+ if(substr($dns_rr[$r]['data'],0,1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],1);
+ if(substr($dns_rr[$r]['data'],-1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],0,-1);
break;
default:
$dns_rr[$r]['aux'] = 0;
@@ -330,6 +354,12 @@
$dns_rr[$r]['aux'] = intval($parts[$pkey+1]);
$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2));
break;
+ case 'txt':
+ $dns_rr[$r]['aux'] = 0;
+ $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
+ if(substr($dns_rr[$r]['data'],0,1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],1);
+ if(substr($dns_rr[$r]['data'],-1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],0,-1);
+ break;
default:
$dns_rr[$r]['aux'] = 0;
$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
--
Gitblit v1.9.1