Changeset 420 for trunk

Timestamp:

10/10/12 13:24:53 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Add a somewhat quick-n-dirty plaintext record list script that
generates a list suitable for copy-pasting. Also note, the
records are formatted to be pasteable directly into BIND zone
files, and anything else that can understand BIND-formatted
records.

Location:

trunk

Files:

• DNSDB.pm (modified) (2 diffs)
• templates/reclist.tmpl (modified) (1 diff)
• textrecs.cgi (added)

trunk/DNSDB.pm

@@ -3377 +3377 @@
   # sort reverse zones on IP, correctly
   # do other fiddling with $args{sortby} while we're at it.
-  $args{sortby} = "r.$args{sortby}";
-  $args{sortby} = 'CAST (r.val AS inet)'
-        if $args{revrec} eq 'y' && $args{defrec} eq 'n' && $args{sortby} eq 'r.val';
-  $args{sortby} = 't.alphaorder' if $args{sortby} eq 'r.type';
+  # whee!  multisort means just passing comma-separated fields in sortby!
+  my $newsort = '';
+  foreach my $sf (split /,/, $args{sortby}) {
+    $sf = "r.$sf";
+    $sf =~ s/r\.val/CAST (r.val AS inet)/
+        if $args{revrec} eq 'y' && $args{defrec} eq 'n';
+    $sf =~ s/r\.type/t.alphaorder/;
+    $newsort .= ",$sf";
+  }
+  $newsort =~ s/^,//;
 
   my $sql = "SELECT r.record_id,r.host,r.type,r.val,r.ttl";
@@ -3391 +3397 @@
   $sql .= " AND NOT r.type=$reverse_typemap{SOA}";
   $sql .= " AND host ~* ?" if $args{filter};
-  $sql .= " ORDER BY $args{sortby} $args{sortorder}";
+  $sql .= " ORDER BY $newsort $args{sortorder}";
   # ensure consistent ordering by sorting on record_id too
   $sql .= ", record_id $args{sortorder}";

trunk/templates/reclist.tmpl

@@ -40 +40 @@
 </tr>
 <tr class="darkrowheader">
-        <td colspan="4">Records</td>
+        <td colspan="3">Records</td>
+        <td align="center"><a href="textrecs.cgi?sid=<TMPL_VAR NAME=sid>&amp;id=<TMPL_VAR NAME=id>&amp;defrec=<TMPL_VAR NAME=defrec>&amp;revrec=<TMPL_VAR NAME=revrec>">Plain text</a></td>
 <TMPL_IF record_create> <td align="right"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=record&amp;parentid=<TMPL_VAR NAME=id>&amp;defrec=<TMPL_VAR NAME=defrec>&amp;revrec=<TMPL_VAR NAME=revrec>&amp;recact=new">Add record</a></td></TMPL_IF>
         <td align="right"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=log&amp;id=<TMPL_VAR NAME=id><TMPL_IF logdom>&amp;ltype=dom</TMPL_IF><TMPL_IF logrdns>&amp;ltype=rdns</TMPL_IF>">View log</a></td>