Changeset 308 for trunk

Timestamp:

04/17/12 18:12:07 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

UI-layer changes to move action logging for importAXFR() out of
dns.cgi (see #35) and introduce a UI checkbox to merge matching
A/AAAA and PTR records on import (see #26, sort of)

Location:

trunk

Files:

• dns.cgi (modified) (4 diffs)
• templates/axfr.tmpl (modified) (2 diffs)

trunk/dns.cgi

@@ -1472 +1472 @@
   $page->param(rwsoa => $webvar{rwsoa}) if $webvar{rwsoa};
   $page->param(rwns => $webvar{rwns}) if $webvar{rwns};
+  # This next one is arguably better on by default, but Breaking Things Is Bad, Mmmkay?
+  $page->param(mergematching => $webvar{mergematching}) if $webvar{mergematching};
   $page->param(dominactive => 1) if (!$webvar{domactive} && $webvar{doit});     # eww.
   $page->param(importdoms => $webvar{importdoms}) if $webvar{importdoms};
@@ -1490 +1492 @@
     }
 
+    # Bizarre Things Happen when you AXFR a null-named zone.
+    $webvar{importdoms} =~ s/^\s+//;
     my @domlist = split /\s+/, $webvar{importdoms};
     my @results;
@@ -1495 +1499 @@
       my %row;
       my ($code,$msg) = importAXFR($dbh, $webvar{ifrom}, $domain, $webvar{group},
-        $webvar{zonestatus}, $webvar{rwsoa}, $webvar{rwns});
+        $webvar{zonestatus}, $webvar{rwsoa}, $webvar{rwns}, $webvar{mergematching});
       $row{domok} = $msg if $code eq 'OK';
       if ($code eq 'WARN') {
@@ -1506 +1510 @@
       }
       $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;
       push @results, \%row;

trunk/templates/axfr.tmpl

@@ -35 +35 @@
 </tr>
 <tr class="datalinelight">
+        <td>Merge records on A+PTR or AAAA+PTR match?</td>
+        <td><input type="checkbox" name="mergematching"<TMPL_IF mergematching> checked="checked"</TMPL_IF> /></td>
+</tr>
+<tr class="datalinelight">
         <td>Import as active?</td>
         <td><input type="checkbox" name="domactive"<TMPL_UNLESS dominactive> checked="checked"</TMPL_UNLESS> /></td>
@@ -40 +44 @@
 <tr class="datalinelight">
         <td valign="top">Domains to import:<br />(one per line)</td>
-        <td><textarea name="importdoms" rows="10" cols="25"><TMPL_IF importdoms><TMPL_VAR NAME=importdoms></TMPL_IF></textarea></td>
+        <td><textarea name="importdoms" rows="10" cols="45"><TMPL_IF importdoms><TMPL_VAR NAME=importdoms></TMPL_IF></textarea></td>
 </tr>
 <tr class="datalinelight">