Changeset 483 for trunk

Timestamp:

03/14/13 17:05:52 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Object conversion of DNSDB.pm, part 15. See #11.

• log-retrieval subs getLogCount() and getLogEntries(), miscellaneous retrieval subs getRevPattern() and getTypelist(), and mailNotify()

Location:

trunk

Files:

• DNSDB.pm (modified) (5 diffs)
• dns-rpc.cgi (modified) (1 diff)
• dns.cgi (modified) (6 diffs)

trunk/DNSDB.pm

@@ -3998 +3998 @@
 # - Entity ID and entity type as the primary log "slice"
 sub getLogCount {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
   my %args = @_;
@@ -4034 +4035 @@
 # - offset for pagination
 sub getLogEntries {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
   my %args = @_;
@@ -4073 +4075 @@
 # Get the narrowest template pattern applicable to a passed CIDR address (may be a netblock or an IP)
 sub getRevPattern {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $cidr = shift;
   my $group = shift || 1;       # just in case
@@ -4094 +4097 @@
 # Returns an arrayref to list of hashrefs perfect for HTML::Template
 sub getTypelist {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $recgroup = shift;
   my $type = shift || $reverse_typemap{A};
@@ -5301 +5305 @@
 # Sends notification mail to recipients regarding a DNSDB operation
 sub mailNotify {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my ($subj,$message) = @_;
 

trunk/dns-rpc.cgi

@@ -621 +621 @@
   _commoncheck(\%args, 'y');
 
-  return DNSDB::getRevPattern($dbh, $args{cidr}, $args{group});
+  return $dnsdb->getRevPattern($args{cidr}, $args{group});
 }
 

trunk/dns.cgi

@@ -365 +365 @@
 
   if ($code eq 'OK') {
-    mailNotify($dbh, "New ".($webvar{makeactive} eq 'on' ? 'Active' : 'Inactive')." Domain Created",
+    $dnsdb->mailNotify("New ".($webvar{makeactive} eq 'on' ? 'Active' : 'Inactive')." Domain Created",
         ($webvar{makeactive} eq 'on' ? 'Active' : 'Inactive').qq( domain "$webvar{domain}" added by ).
         $session->param("username"));
@@ -686 +686 @@
     $page->param(port           => $recdata->{port});
     $page->param(ttl            => $recdata->{ttl});
-    $page->param(typelist       => getTypelist($dbh, $webvar{revrec}, $recdata->{type}));
+    $page->param(typelist       => $dnsdb->getTypelist($webvar{revrec}, $recdata->{type}));
 
     if ($webvar{defrec} eq 'n') {
@@ -1460 +1460 @@
 
   $page->param(qfor => $webvar{qfor}) if $webvar{qfor};
-  $page->param(typelist => getTypelist($dbh, 'l', ($webvar{type} ? $webvar{type} : undef)));
+  $page->param(typelist => $dnsdb->getTypelist('l', ($webvar{type} ? $webvar{type} : undef)));
   $page->param(nrecurse => $webvar{nrecurse}) if $webvar{nrecurse};
   $page->param(resolver => $webvar{resolver}) if $webvar{resolver};
@@ -1649 +1649 @@
   }
   $webvar{ltype} = 'group' if !$webvar{ltype};
-  my $lcount = getLogCount($dbh, (id => $id, logtype => $webvar{ltype})) or push @debugbits, $DNSDB::errstr;
+  my $lcount = $dnsdb->getLogCount(id => $id, logtype => $webvar{ltype}) or push @debugbits, $dnsdb->errstr;
 
   $page->param(id => $id);
@@ -1673 +1673 @@
 
 ##fixme:  increase per-page limit or use separate limit for log?  some ops give *lots* of entries...
-  my $logentries = getLogEntries($dbh, (id => $id, logtype => $webvar{ltype},
-        offset => $webvar{offset}, sortby => $sortby, sortorder => $sortorder));
+  my $logentries = $dnsdb->getLogEntries(id => $id, logtype => $webvar{ltype},
+        offset => $webvar{offset}, sortby => $sortby, sortorder => $sortorder);
   $page->param(logentries => $logentries);
 
@@ -1918 +1918 @@
 
 sub fill_recdata {
-  $page->param(typelist => getTypelist($dbh, $webvar{revrec}, $webvar{type}));
+  $page->param(typelist => $dnsdb->getTypelist($webvar{revrec}, $webvar{type}));
 
 # le sigh.  we may get called with many empty %webvar keys