Merged revisions 2741-2788 from SVN stable branch.

tbrehm

2011-11-21 edf806b98d675a2037b019644aff76b7e8b7738c

 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));