Changeset 101 for trunk/DNSDB.pm

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

File:

• trunk/DNSDB.pm (modified) (3 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;