Changeset 91 for trunk/dns.cgi

Timestamp:

04/13/11 16:00:10 (14 years ago)

Author:

Kris Deugau

Message:

/trunk

SQL tabledef update:

• Tweak log table definition to cope with looooong entries (mainly from AXFR warnings)

DNSDB.pm:

• Add domainID and getRecCount subs in DNSDB
• Return more user-friendly error on attempting to add a domain with no name
• Nitpick-tweak DB calls and SQL formatting in domainName()
• Replace placeholderish OK message in importAXFR()

dns.cgi:

• Trim some more direct SQL out in reclist
• Uninitialized-variable cleanup in AXFR import
• Add logging to AXFR import
• Don't complain about uninitialized variables in record-display

File:

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

trunk/dns.cgi

@@ -249 +249 @@
   $page->param(curpage => $webvar{page});
 
-  my $sth = $dbh->prepare("SELECT count(*) FROM ".
-        ($webvar{defrec} eq 'y' ? 'default_' : '')."records ".
-        "WHERE ".($webvar{defrec} eq 'y' ? 'group' : 'domain')."_id=? ".
-        "AND NOT type=$reverse_typemap{SOA}");
-  $sth->execute($webvar{id});
-  my ($count) = ($sth->fetchrow_array);
+  my $count = getRecCount($dbh, $webvar{defrec}, $webvar{id});
 
 #  $sortby = 'host';
@@ -919 +914 @@
   $page->param(importdoms => $webvar{importdoms}) if $webvar{importdoms};
 
-##fixme: check group too?
+  # shut up warning about uninitialized variable
+  $webvar{doit} = '' if !defined($webvar{doit});
+
   if ($webvar{doit} eq 'y' && !$webvar{ifrom}) {
     $page->param(errmsg => "Need to set host to import from");
   } elsif ($webvar{doit} eq 'y' && !$webvar{importdoms}) {
     $page->param(errmsg => "Need domains to import");
-  } else {
+  } elsif ($webvar{doit} eq 'y') {
     my @domlist = split /\s+/, $webvar{importdoms};
     my @results;
-my $rnum = 0;
     foreach my $domain (@domlist) {
       my %row;
       my ($code,$msg) = importAXFR($dbh, $webvar{ifrom}, $domain, $webvar{group},
         $webvar{domstatus}, $webvar{rwsoa}, $webvar{rwns});
-##fixme: log
       $row{domok} = $msg if $code eq 'OK';
       if ($code eq 'WARN') {
@@ -939 +934 @@
       }
       if ($code eq 'FAIL') {
-        $msg =~ s|\n|<br />|g;
+        $msg =~ s|\n|<br />\n|g;
         $row{domerr} = $msg;
       }
-      # do stuff!  DNSDB::importAXFR($webvar{ifrom}, $webvar{rwsoa}, $webvar{rwns}, $domain, <flags>)
+      $msg = "<br />\n".$msg if $msg =~ m|<br />|;
+      logaction(domainID($dbh, $domain), $session->param("username"), $webvar{group},
+        "AXFR import $domain from $webvar{ifrom} ($code): $msg");
       $row{domain} = $domain;
-#      $row{row} = $rnum++;
       push @results, \%row;
     }
@@ -1224 +1220 @@
 sub fill_recdata {
   fill_rectypes($webvar{type});
+
+# le sigh.  we may get called with many empty %webvar keys
+  no warnings qw( uninitialized );
 
   $page->param(name     => $webvar{name});