Changeset 101 for trunk

Timestamp:

07/06/11 17:17:46 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

dns.cgi:

Prefill <domain> or DOMAIN in Hostname field on add record page
Set initial TTL correctly based on SOA record rather than hardcoded defaults

DNSDB.pm:

Tweak retrieval code to pull SOA's serial from distance field

Location:

trunk

Files:

• DNSDB.pm (modified) (3 diffs)
• dns.cgi (modified) (4 diffs)

trunk/DNSDB.pm

@@ -58 +58 @@
 
 # Halfway sane defaults for SOA, TTL, etc.
+# serial defaults to 0 for convenience.
+# value will be either YYYYMMDDNN for BIND/etc, or auto-internal for tinydns
 our %def = qw (
         contact hostmaster.DOMAIN
         prins   ns1.myserver.com
+        serial  0
         soattl  86400
         refresh 10800
@@ -976 +979 @@
   my %ret;
 
-  my $sql = "select record_id,host,val,ttl from";
+  # (ab)use distance and weight columns to store SOA data
+
+  my $sql = "SELECT record_id,host,val,ttl,distance from";
   if ($def eq 'def' or $def eq 'y') {
-    $sql .= " default_records where group_id=$id and type=$reverse_typemap{SOA}";
+    $sql .= " default_records WHERE group_id=? AND type=$reverse_typemap{SOA}";
   } else {
     # we're editing a live SOA record;  find based on domain
-    $sql .= " records where domain_id=$id and type=$reverse_typemap{SOA}";
+    $sql .= " records WHERE domain_id=? AND type=$reverse_typemap{SOA}";
   }
   my $sth = $dbh->prepare($sql);
-  $sth->execute;
-
-  my ($recid,$host,$val,$ttl) = $sth->fetchrow_array();
+  $sth->execute($id);
+
+  my ($recid,$host,$val,$ttl,$serial) = $sth->fetchrow_array();
   my ($prins,$contact) = split /:/, $host;
   my ($refresh,$retry,$expire,$minttl) = split /:/, $val;
@@ -992 +997 @@
   $ret{recid}   = $recid;
   $ret{ttl}     = $ttl;
+  $ret{serial}  = $serial;
   $ret{prins}   = $prins;
   $ret{contact} = $contact;

trunk/dns.cgi

@@ -37 +37 @@
 
 my @debugbits;  # temp, to be spit out near the end of processing
-my $debugenv = 1;
+my $debugenv = 0;
 
 # Let's do these templates right...
@@ -1269 +1269 @@
   no warnings qw( uninitialized );
 
-  $page->param(name     => $webvar{name});
+##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})
@@ -1275 +1278 @@
   $page->param(weight   => $webvar{weight}) if $webvar{type} == $reverse_typemap{SRV};
   $page->param(port     => $webvar{port}) if $webvar{type} == $reverse_typemap{SRV};
-  $page->param(ttl      => ($webvar{ttl} ? $webvar{ttl} : $DNSDB::def{minttl}));
+# retrieve the right ttl instead of falling (way) back to the hardcoded system default
+  my %soa = getSOA($dbh,$webvar{defrec},$webvar{parentid});
+  $page->param(ttl      => ($webvar{ttl} ? $webvar{ttl} : $soa{minttl}));
 }
 
@@ -1677 +1682 @@
 
 ##fixme: push SQL into DNSDB.pm
+##fixme: add bits to retrieve group/domain name info to retain after entity is deleted?
   my $sth = $dbh->prepare("SELECT user_id, firstname || ' ' || lastname FROM users WHERE username=?");
   $sth->execute($username);