Changeset 422 for branches/stable/textrecs.cgi

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)
• textrecs.cgi (copied) (copied from trunk/textrecs.cgi ) (3 diffs)

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';