Changeset 548 for branches/stable/textrecs.cgi

Timestamp:

12/11/13 16:01:18 (11 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge reverse DNS work and object conversion from /trunk, part 5

Includes changes through r543 with a few more minor conflicts.

Location:

branches/stable

Files:

• . (modified) (1 prop)
• textrecs.cgi (modified) (5 diffs)

branches/stable/textrecs.cgi

@@ -3 +3 @@
 ##
 # $Id$
-# Copyright 2012 Kris Deugau <kdeugau@deepnet.cx>
+# Copyright 2012,2013 Kris Deugau <kdeugau@deepnet.cx>
 # 
 #    This program is free software: you can redistribute it and/or modify
@@ -51 +51 @@
 
 # Check the session and if we have a zone ID to retrieve.  Call a failure sub if not.
-my $sid = ($webvar{sid} ? $webvar{sid} : undef);
+my $sid = $q->cookie('dnsadmin_session');
 my $session = new CGI::Session("driver:File", $sid, {Directory => $dnsdb->{sessiondir}})
         or die CGI::Session->errstr();
@@ -63 +63 @@
 
 ##fixme:  do we support both HTML-plain and true plaintext?  could be done, with another $webvar{}
-# Don't die on bad parameters.  Saves munging the return from getDomRecs.
+# Don't die on bad parameters.  Saves munging the return from getRecList.
 #my $page = HTML::Template->new(filename => "$templatedir/textrecs.tmpl",
 #       loop_context_vars => 1, global_vars => 1, die_on_bad_params => 0);
@@ -73 +73 @@
 print qq(Press the "Back" button to return to the standard record list.\n\n);
 
-my $reclist = $dnsdb->getDomRecs(defrec => $webvar{defrec}, revrec => $webvar{revrec}, id => $webvar{id},
+my $reclist = $dnsdb->getRecList(defrec => $webvar{defrec}, revrec => $webvar{revrec}, id => $webvar{id},
         sortby => ($webvar{revrec} eq 'n' ? 'type,host' : 'type,val'), sortorder => 'ASC');
 foreach my $rec (@$reclist) {
@@ -81 +81 @@
   $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';
-  printf "%-45s\t%d\t%s\t%s\n", $rec->{host}, $rec->{ttl}, $rec->{type}, $rec->{val};
+  if ($webvar{revrec} eq 'y') {
+    printf "%-16s\t%d\t%s\t%s\n", $rec->{val}, $rec->{ttl}, $rec->{type}, $rec->{host};
+  } else {
+    printf "%-45s\t%d\t%s\t%s\n", $rec->{host}, $rec->{ttl}, $rec->{type}, $rec->{val};
+  }
 }
 #$page->param(defrec => ($webvar{defrec} eq 'y'));