Changeset 35 for trunk/dns.cgi

Timestamp:

11/13/09 18:05:34 (15 years ago)

Author:

Kris Deugau

Message:

/trunk

checkpoint - my Net::DNS vs DBD::Pg weirdness went away

• clean up return-message handling for AXFR
• check AXFR host to remove taint flag so IO::Socket doesn't whine
• rearrange statement handles in DNSDB::importAXFR
• add some flags to fail on no records at all, no SOA, or no NS records
• tweak template to put error in a row at the top of the import form vs an uncontrolled div

File:

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

trunk/dns.cgi

@@ -601 +601 @@
   $page->param(rwsoa => $webvar{rwsoa}) if $webvar{rwsoa};
   $page->param(rwns => $webvar{rwns}) if $webvar{rwns};
-  $page->param(dominactive => 1) unless $webvar{domactive};
+  $page->param(dominactive => 1) if !$webvar{domactive};
   $page->param(importdoms => $webvar{importdoms}) if $webvar{importdoms};
 ##work
@@ -618 +618 @@
       my ($code,$msg) = importAXFR($dbh, $webvar{ifrom}, $domain, $webvar{group},
         $webvar{domstatus}, $webvar{rwsoa}, $webvar{rwns});
-  $row{domok} = 1 if $code eq 'OK';
-  $row{domwarn} = $msg if $code eq 'WARN';
-  $row{domerr} = $msg if $code eq 'FAIL';
-push @debugbits, "$domain: $code<br>\n";
+      $row{domok} = $msg if $code eq 'OK';
+      if ($code eq 'WARN') {
+        $msg =~ s|\n|<br />|g;
+        $row{domwarn} = $msg;
+      }
+      $row{domerr} = $msg if $code eq 'FAIL';
       # do stuff!  DNSDB::importAXFR($webvar{ifrom}, $webvar{rwsoa}, $webvar{rwns}, $domain, <flags>)
       $row{domain} = $domain;
@@ -630 +632 @@
   }
 
-  push @debugbits, "<pre>$webvar{importdoms}</pre>";
 }