Changeset 550

Timestamp:

12/11/13 17:10:05 (11 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge reverse DNS and other updates, cleanup.

Crosscheck and clean up a few dangling bits that didn't get merged
correctly due to conflicts.

Location:

branches/stable

Files:

• DNSDB.pm (modified) (5 diffs)
• textrecs.cgi (modified) (2 diffs)

branches/stable/DNSDB.pm

@@ -3599 +3599 @@
   # 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';
-
-  my $sql = "SELECT r.record_id,r.host,r.type,r.val,r.ttl";
-  $sql .= ",l.description AS locname" if $args{defrec} eq 'n';
-  $sql .= ",r.distance,r.weight,r.port" if $args{revrec} eq 'n';
-  $sql .= " FROM "._rectable($args{defrec},$args{revrec})." r ";
-
   # whee!  multisort means just passing comma-separated fields in sortby!
   my $newsort = '';
-  foreach my $sf (split /,/, $order) {
+  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";
@@ -3629 +3621 @@
   $sql .= " AND NOT r.type=$reverse_typemap{SOA}";
   $sql .= " AND (r.host ~* ? OR r.val ~* ?)" 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}";
@@ -3706 +3698 @@
 
   # Spaces are evil.
-  $host =~ s/^\s+//;
-  $host =~ s/\s+$//;
-  if ($typemap{$rectype} ne 'TXT') {
+  $$host =~ s/^\s+//;
+  $$host =~ s/\s+$//;
+  if ($typemap{$$rectype} ne 'TXT') {
     # Leading or trailng spaces could be legit in TXT records.
-    $val =~ s/^\s+//;
-    $val =~ s/\s+$//;
+    $$val =~ s/^\s+//;
+    $$val =~ s/\s+$//;
   }
 
@@ -3870 +3862 @@
 
   # Spaces are evil.
-  $host =~ s/^\s+//;
-  $host =~ s/\s+$//;
-  if ($typemap{$type} ne 'TXT') {
+  $$host =~ s/^\s+//;
+  $$host =~ s/\s+$//;
+  if ($typemap{$$rectype} ne 'TXT') {
     # Leading or trailng spaces could be legit in TXT records.
-    $val =~ s/^\s+//;
-    $val =~ s/\s+$//;
+    $$val =~ s/^\s+//;
+    $$val =~ s/\s+$//;
   }
 
@@ -4677 +4669 @@
 
       my $type = $rr->type;
-      my $ttl = ($newttl ? $newttl : $rr->ttl); # allow force-override TTLs
       my $host = $rr->name;
       my $ttl = ($args{newttl} ? $args{newttl} : $rr->ttl);     # allow force-override TTLs

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
 
 my $dnsdb = new DNSDB;
@@ -70 +70 @@
 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 records for $zone.\n" if $webvar{defrec} eq 'y';
+print "Plaintext version of default ".($webvar{revrec} eq 'y' ? 'reverse ' : '')."records for $zone.\n"
+        if $webvar{defrec} eq 'y';
 print qq(Press the "Back" button to return to the standard record list.\n\n);