Changeset 277 for trunk/dns.cgi

Timestamp:

03/15/12 18:04:02 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Checkpoint: Clean up SOA editing and extend for reverse zones.
Mostly complete; still need to finish shuffling arguments to
get logging moved into DNSDB.pm
See #26

File:

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

trunk/dns.cgi

@@ -908 +908 @@
   }
 
-  fillsoa($webvar{defrec},$webvar{id});
+  fillsoa($webvar{defrec},$webvar{revrec},$webvar{id});
 
 } elsif ($webvar{page} eq 'updatesoa') {
@@ -930 +930 @@
 
   # get old SOA for log
-  my %soa = getSOA($dbh,$webvar{defrec},$webvar{id});
-
-  my $sth;
-##fixme:  push SQL into DNSDB.pm
-##fixme: data validation: make sure {recid} is really the SOA for {id}
-  # no domain ID, so we're editing the default SOA for a group (we don't care which one here)
-  # plus a bit of magic to update the appropriate table
-  my $sql = "UPDATE ".($webvar{defrec} eq 'y' ? "default_records" : "records").
-        " SET host=?, val=?, ttl=? WHERE record_id=?";
-  $sth = $dbh->prepare($sql);
-  $sth->execute("$webvar{contact}:$webvar{prins}", 
-        "$webvar{refresh}:$webvar{retry}:$webvar{expire}:$webvar{minttl}",
-        $webvar{ttl},
-        $webvar{recid});
-
-  if ($sth->err) {
+  my %soa = getSOA($dbh,$webvar{defrec},$webvar{revrec},$webvar{id});
+
+#  my $sth;
+###fixme:  push SQL into DNSDB.pm
+###fixme: data validation: make sure {recid} is really the SOA for {id}
+#  # no domain ID, so we're editing the default SOA for a group (we don't care which one here)
+#  # plus a bit of magic to update the appropriate table
+#  my $sql = "UPDATE ".($webvar{defrec} eq 'y' ? "default_records" : "records").
+#       " SET host=?, val=?, ttl=? WHERE record_id=?";
+#  $sth = $dbh->prepare($sql);
+#  $sth->execute("$webvar{contact}:$webvar{prins}", 
+#       "$webvar{refresh}:$webvar{retry}:$webvar{expire}:$webvar{minttl}",
+#       $webvar{ttl},
+#       $webvar{recid});
+
+  my ($code, $msg) = updateSOA($dbh, $webvar{defrec}, $webvar{revrec},
+        (contact => $webvar{contact}, prins => $webvar{prins}, refresh => $webvar{refresh},
+        retry => $webvar{retry}, expire => $webvar{expire}, minttl => $soa{minttl},
+        ttl => $webvar{ttl}, recid => $webvar{recid}) );
+  if ($code eq 'OK') {
+    changepage(page => "reclist", id => $webvar{id}, defrec => $webvar{defrec}, revrec => $webvar{revrec},
+        resultmsg => "SOA record updated");
+  } else {
     $page->param(update_failed => 1);
-    $page->param(msg => $DBI::errstr);
-    fillsoa($webvar{defrec},$webvar{id});
+    $page->param(msg => $DNSDB::errstr);
+    fillsoa($webvar{defrec},$webvar{revrec},$webvar{id});
+  }
+
 ##fixme: faillog
-  } else {
-
+#  } else {
+if (0) {
     # do this in the order of "default to most common case"
     my $loggroup;
@@ -969 +978 @@
         "(ns $webvar{prins}, contact $webvar{contact}, refresh $webvar{refresh},".
         " retry $webvar{retry}, expire $webvar{expire}, minTTL $webvar{minttl}, TTL $webvar{ttl})");
-    changepage(page => "reclist", id => $webvar{id}, defrec => $webvar{defrec},
-        resultmsg => "SOA record updated");
-  }
+  } # if (0)
 
 } elsif ($webvar{page} eq 'grpman') {
@@ -1895 +1902 @@
 
 sub fillsoa {
-  my $def = shift;
+  my $defrec = shift;
+  my $revrec = shift;
   my $id = shift;
-  my $domname = ($def eq 'y' ? '' : "DOMAIN");
-
-  $page->param(defrec   => $def);
+  my $domname = ($defrec eq 'y' ? '' : "DOMAIN");
+
+  $page->param(defrec   => $defrec);
+  $page->param(revrec   => $revrec);
 
 # i had a good reason to do this when I wrote it...
 #  $page->param(domain  => $domname);
 #  $page->param(group   => $DNSDB::group);
-  $page->param(isgrp => 1) if $def eq 'y';
-  $page->param(parent => ($def eq 'y' ? groupName($dbh, $DNSDB::group) : domainName($dbh, $id)) );
+  $page->param(isgrp => 1) if $defrec eq 'y';
+  $page->param(parent => ($defrec eq 'y' ? groupName($dbh, $id) :
+        ($revrec eq 'n' ? domainName($dbh, $id) : revName($dbh, $id)) ) );
 
 # defaults
@@ -1917 +1927 @@
 
   # there are probably better ways to do this.  TMTOWTDI.
-  my %soa = getSOA($dbh,$def,$id);
+  my %soa = getSOA($dbh,$defrec,$revrec,$id);
 
   $page->param(id       => $id);