Changeset 547 for branches/stable/textrecs.cgi

Timestamp:

12/11/13 15:45:18 (10 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge reverse DNS work and object conversion from /trunk, 4 of mumble

Includes changes through r492 with a few minor conflicts.

Location:

branches/stable

Files:

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

branches/stable/textrecs.cgi

@@ -31 +31 @@
 use lib '.';    ##uselib##
 
-use DNSDB qw(:ALL);
+use DNSDB;
 
 # Let's do these templates right...
@@ -48 +48 @@
 #$webvar{revrec} = 'n' if !$webvar{revrec};     # non-reverse (domain) records
 
-# load some local system defaults (mainly DB connect info)
-# note this is not *absolutely* fatal, since there's a default dbname/user/pass in DNSDB.pm
-# we'll catch a bad DB connect string once we get to trying that
-##fixme:  pass params to loadConfig, and use them there, to allow one codebase to support multiple sites
-if (!loadConfig()) {
-  warn "Using default configuration;  unable to load custom settings: $DNSDB::errstr";
-}
+my $dnsdb = new DNSDB;
 
 # 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 $session = new CGI::Session("driver:File", $sid, {Directory => $config{sessiondir}})
+my $session = new CGI::Session("driver:File", $sid, {Directory => $dnsdb->{sessiondir}})
         or die CGI::Session->errstr();
 do_not_pass_go() if !$sid;
 do_not_pass_go() if !$webvar{id};
 
-##fixme: quit throwing the database handle around, and put all the SQL and direct DB fiddling into DNSDB.pm
-# dbname, user, pass, host (optional)
-my ($dbh,$msg) = connectDB($config{dbname}, $config{dbuser}, $config{dbpass}, $config{dbhost});
-# Load config pieces from the database.  Ideally all but the DB user/pass/etc should be loaded here.
-initGlobals($dbh);
-
 my $zone;
-$zone = domainName($dbh, $webvar{id}) if $webvar{defrec} eq 'n';
-$zone = "group ".groupName($dbh, $webvar{id}) if $webvar{defrec} eq 'y';
+$zone = ($webvar{revrec} eq 'n' ? $dnsdb->domainName($webvar{id}) : $dnsdb->revName($webvar{id}))
+        if $webvar{defrec} eq 'n';
+$zone = "group ".$dnsdb->groupName($webvar{id}) if $webvar{defrec} eq 'y';
 
 ##fixme:  do we support both HTML-plain and true plaintext?  could be done, with another $webvar{}
@@ -84 +73 @@
 print qq(Press the "Back" button to return to the standard record list.\n\n);
 
-my $reclist = getDomRecs($dbh, $webvar{defrec}, $webvar{id}, 0, 'all', 'type,host', 'ASC');
-
+my $reclist = $dnsdb->getDomRecs(defrec => $webvar{defrec}, revrec => $webvar{revrec}, id => $webvar{id},
+        sortby => ($webvar{revrec} eq 'n' ? 'type,host' : 'type,val'), sortorder => 'ASC');
 foreach my $rec (@$reclist) {
   $rec->{type} = $typemap{$rec->{type}};