Changeset 242

Timestamp:

02/23/12 17:54:48 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix buglet that snuck back into A/AAAA+PTR add - domain ID was
not added field list or bind-values array. See #26.
Log entry update: Accidentally committed cleanups on fill_recdata
and several parts of the record page:

• Fill in suitable starting points for domain name and IP address on adding reverse records, same as forward records start with the base domain name
• Fix SOA retrieval for default TTL

Location:

trunk

Files:

• DNSDB.pm (modified) (1 diff)
• dns.cgi (modified) (3 diffs)

trunk/DNSDB.pm

@@ -501 +501 @@
         return ('WARN', $msg);
       }
+
+      # Add domain ID to field list and values
+      ${$args{fields}} .= "domain_id,";
+      push @{$args{vallist}}, ${$args{domid}};
 
     } else {

trunk/dns.cgi

@@ -598 +598 @@
       $page->param(fwdzone      => $webvar{revrec} eq 'n');
       fill_recdata();   # populate the form... er, mostly.
-      $page->param(name => $webvar{name});
       if ($config{log_failures}) {
         if ($webvar{defrec} eq 'y') {
@@ -684 +683 @@
   } else {
     $page->param(parentid => $webvar{parentid});
-    $page->param(dohere => domainName($dbh,$webvar{parentid}));
+    $page->param(dohere => domainName($dbh,$webvar{parentid})) if $webvar{revrec} eq 'n';
+    $page->param(dohere => revName($dbh,$webvar{parentid})) if $webvar{revrec} eq 'y';
   }
 
@@ -1812 +1812 @@
 ##todo:  allow BIND-style bare names, ASS-U-ME that the name is within the domain?
 # prefill <domain> or DOMAIN in "Host" space for new records
-  my $domroot = ($webvar{defrec} eq 'y' ? 'DOMAIN' : domainName($dbh,$webvar{parentid}));
-  $page->param(name     => $domroot);
-  $page->param(address  => $webvar{address});
-  $page->param(distance => $webvar{distance})
+  if ($webvar{revrec} eq 'n') {
+    my $domroot = ($webvar{defrec} eq 'y' ? 'DOMAIN' : domainName($dbh,$webvar{parentid}));
+    $page->param(name   => $domroot);
+    $page->param(address        => $webvar{address});
+    $page->param(distance       => $webvar{distance})
         if ($webvar{type} == $reverse_typemap{MX} or $webvar{type} == $reverse_typemap{SRV});
-  $page->param(weight   => $webvar{weight}) if $webvar{type} == $reverse_typemap{SRV};
-  $page->param(port     => $webvar{port}) if $webvar{type} == $reverse_typemap{SRV};
+    $page->param(weight => $webvar{weight}) if $webvar{type} == $reverse_typemap{SRV};
+    $page->param(port   => $webvar{port}) if $webvar{type} == $reverse_typemap{SRV};
+  } else {
+    my $domroot = ($webvar{defrec} eq 'y' ? 'ADMINDOMAIN' : ".$config{domain}");
+    $page->param(name   => ($webvar{name} ? $webvar{name} : $domroot));
+    my $zname = ($webvar{defrec} eq 'y' ? 'ZONE' : revName($dbh,$webvar{parentid}));
+    $zname =~ s|\d*/\d+$||;
+    $page->param(address        => ($webvar{address} ? $webvar{address} : $zname));
+  }
 # retrieve the right ttl instead of falling (way) back to the hardcoded system default
-  my %soa = getSOA($dbh,$webvar{defrec},$webvar{parentid});
+  my %soa = getSOA($dbh,$webvar{defrec},$webvar{revrec},$webvar{parentid});
   $page->param(ttl      => ($webvar{ttl} ? $webvar{ttl} : $soa{minttl}));
 }