Changeset 583 for trunk/dns.cgi

Timestamp:

01/03/14 14:58:09 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Revise and extend the showrec_arpa_ns hack to optionally cover all
displayed zone names, all displayed records, or both

May still need a little more fixing for complete coverage.

File:

• trunk/dns.cgi (modified) (5 diffs)

trunk/dns.cgi

@@ -2004 +2004 @@
 
   foreach my $rec (@$foo2) {
-    # NS records.  Need to do this first before we convert the type-value to the text representation
-    if ($rev eq 'y' && $dnsdb->{showrec_arpa_ns} && $rec->{type} == $reverse_typemap{NS}) {
-      my $tmp = new NetAddr::IP $rec->{val};
-      $rec->{val} = DNSDB::_ZONE($tmp, 'ZONE', 'r', '.').($tmp->{isv6} ? '.ip6.arpa' : '.in-addr.arpa');
-    }
     $rec->{type} = $typemap{$rec->{type}};
     $rec->{fwdzone} = $rev eq 'n';
@@ -2034 +2029 @@
 
 sub fill_recdata {
-  $page->param(typelist => $dnsdb->getTypelist($webvar{revrec}, $webvar{type}));
-
-# le sigh.  we may get called with many empty %webvar keys
+  # le sigh.  we may get called with many empty %webvar keys
   no warnings qw( uninitialized );
 
@@ -2042 +2035 @@
 # prefill <domain> or DOMAIN in "Host" space for new records
   if ($webvar{revrec} eq 'n') {
+    $page->param(typelist => $dnsdb->getTypelist($webvar{revrec}, $webvar{type}));
     my $domroot = ($webvar{defrec} eq 'y' ? 'DOMAIN' : $dnsdb->domainName($webvar{parentid}));
     $page->param(name   => ($webvar{name} ? $webvar{name} : $domroot));
@@ -2052 +2046 @@
     my $domroot = ($webvar{defrec} eq 'y' ? 'ADMINDOMAIN' : ".$dnsdb->{domain}");
     $page->param(name   => ($webvar{name} ? $webvar{name} : $domroot));
-    my $zname = ($webvar{defrec} eq 'y' ? 'ZONE' : $dnsdb->revName($webvar{parentid}));
+    my $zname = ($webvar{defrec} eq 'y' ? 'ZONE' : $dnsdb->revName($webvar{parentid}, 'y'));
+    my $cidr = new NetAddr::IP $zname;
     $zname =~ s|\d*/\d+$||;
     $page->param(address        => ($webvar{address} ? $webvar{address} : $zname));
+    $page->param(typelist => $dnsdb->getTypelist($webvar{revrec},
+        $webvar{type} || ($cidr->{isv6} ? $reverse_typemap{'AAAA+PTR'} : $reverse_typemap{'A+PTR'})));
   }
 # retrieve the right ttl instead of falling (way) back to the hardcoded system default
@@ -2183 +2180 @@
         );
 # probably don't need this, keeping for reference for now
-#  foreach (@$zonelist) {
+#  foreach my $rec (@$zonelist) {
 #  }
   $page->param(domtable => $zonelist);