ftimme
2011-11-01 25242a2179460ff51f275ce85ce7d6a771ef467b
- DNS/Import zone file: fixed problem with double quotes around TXT records.
1 files modified
30 ■■■■■ changed files
interface/web/dns/dns_import.php 30 ●●●●● patch | view | raw | blame | history
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));