Changeset 422 for branches/stable

Timestamp:

10/10/12 13:41:00 (12 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge plaintext record list feature from /trunk r420 and r421,
with minor changes to account for no reverse records.
Bump patch version.

Location:

branches/stable

Files:

• . (modified) (1 prop)
• DNSDB.pm (modified) (3 diffs)
• Makefile (modified) (1 diff)
• templates/reclist.tmpl (modified) (1 diff)
• templates/textrecs.tmpl (copied) (copied from trunk/templates/textrecs.tmpl )
• textrecs.cgi (copied) (copied from trunk/textrecs.cgi ) (3 diffs)

branches/stable/DNSDB.pm

@@ -32 +32 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
-$VERSION        = 1.0.2;        ##VERSION##
+$VERSION        = 1.0.3;        ##VERSION##
 @ISA            = qw(Exporter);
 @EXPORT_OK      = qw(
@@ -1315 +1315 @@
   $sql .= "default_" if $type eq 'y';
   $sql .= "records r ";
+
+  # whee!  multisort means just passing comma-separated fields in sortby!
+  my $newsort = '';
+  foreach my $sf (split /,/, $order) {
+    $sf = "r.$sf";
+    $sf =~ s/r\.type/t.alphaorder/;
+    $newsort .= ",$sf";
+  }
+  $newsort =~ s/^,//;
+
   $sql .= "INNER JOIN rectypes t ON r.type=t.val ";     # for sorting by type alphabetically
   if ($type eq 'y') {
@@ -1324 +1334 @@
   $sql .= " AND host ~* ?" if $filter;
   # use alphaorder column for "correct" ordering of sort-by-type instead of DNS RR type number
-  $sql .= " ORDER BY ".($order eq 'type' ? 't.alphaorder' : "r.$order")." $direction";
+  $sql .= " ORDER BY $newsort $direction";
   $sql .= " LIMIT $nrecs OFFSET ".($nstart*$nrecs) if $nstart ne 'all';
 

branches/stable/Makefile

@@ -3 +3 @@
 
 PKGNAME=dnsadmin
-VERSION=1.0.2
+VERSION=1.0.3
 RELEASE=1
 

branches/stable/templates/reclist.tmpl

@@ -44 +44 @@
 </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>">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;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>">View log</a></td>

branches/stable/textrecs.cgi

@@ -46 +46 @@
 # shut up some warnings, in case we arrive somewhere we forgot to set this
 $webvar{defrec} = 'n' if !$webvar{defrec};      # non-default records
-$webvar{revrec} = 'n' if !$webvar{revrec};      # non-reverse (domain) records
+#$webvar{revrec} = 'n' if !$webvar{revrec};     # non-reverse (domain) records
 
 # load some local system defaults (mainly DB connect info)
@@ -70 +70 @@
 
 my $zone;
-$zone = ($webvar{revrec} eq 'n' ? domainName($dbh, $webvar{id}) : revName($dbh, $webvar{id}))
-        if $webvar{defrec} eq 'n';
+$zone = domainName($dbh, $webvar{id}) if $webvar{defrec} eq 'n';
 $zone = "group ".groupName($dbh, $webvar{id}) if $webvar{defrec} eq 'y';
 
@@ -82 +81 @@
 print "Content-type: text/plain\n\n";
 print "Plaintext version of records for $zone.\n" if $webvar{defrec} eq 'n';
-print "Plaintext version of default ".($webvar{revrec} eq 'y' ? 'reverse ' : '')."records for $zone.\n"
-        if $webvar{defrec} eq 'y';
+print "Plaintext version of default records for $zone.\n" if $webvar{defrec} eq 'y';
 print qq(Press the "Back" button to return to the standard record list.\n\n);
 
-my $reclist = getDomRecs($dbh, (defrec => $webvar{defrec}, revrec => $webvar{revrec}, id => $webvar{id},
-        sortby => ($webvar{revrec} eq 'n' ? 'type,host' : 'type,val'), sortorder => 'ASC') );
+my $reclist = getDomRecs($dbh, $webvar{defrec}, $webvar{id}, 0, 'all', 'type,host', 'ASC');
+
 foreach my $rec (@$reclist) {
   $rec->{type} = $typemap{$rec->{type}};
-  $rec->{val} .= '.' if $rec->{type} ne 'A' && $webvar{revrec} eq 'n' && $rec->{val} !~ /\.$/;
-  $rec->{host} .= '.' if $webvar{revrec} eq 'y' && $rec->{val} !~ /\.$/;
+  $rec->{val} .= '.' if $rec->{type} ne 'A' && $rec->{val} !~ /\.$/;
+  $rec->{host} .= '.' if $rec->{val} !~ /\.$/;
   $rec->{val} = "$rec->{distance}  $rec->{val}" if $rec->{type} eq 'MX';
   $rec->{val} = "$rec->{distance}  $rec->{weight}  $rec->{port}  $rec->{val}" if $rec->{type} eq 'SRV';