Changeset 477 for trunk/dns-rpc.cgi

Timestamp:

03/13/13 17:10:34 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Object conversion of DNSDB.pm, 11 of <mumble>. See #11.

• convert addDomain(), delZone(), addRDNS(), getZoneCount(), getZoneList() getZoneLocation(), zoneStatus(), and getZonesByCIDR() and callers
• fix a couple of missed utility calls in dns-rpc.cgi as well

File:

• trunk/dns-rpc.cgi (modified) (8 diffs)

trunk/dns-rpc.cgi

@@ -114 +114 @@
   my $argref = shift;
   if (!$argref->{location} && $argref->{defrec} eq 'n') {
-    $argref->{location} = DNSDB::getZoneLocation($dbh, $argref->{revrec}, $argref->{parent_id});
+    $argref->{location} = $dnsdb->getZoneLocation($argref->{revrec}, $argref->{parent_id});
   }
 }
@@ -142 +142 @@
   _commoncheck(\%args, 'y');
 
-  my ($code, $msg) = DNSDB::addDomain($dbh, $args{domain}, $args{group}, $args{state});
+  my ($code, $msg) = $dnsdb->addDomain($args{domain}, $args{group}, $args{state});
   die $msg if $code eq 'FAIL';
   return $msg;  # domain ID
@@ -156 +156 @@
   # Let's be nice;  delete based on zone id OR zone name.  Saves an RPC call round-trip, maybe.
   if ($args{zone} =~ /^\d+$/) {
-    ($code,$msg) = DNSDB::delZone($dbh, $args{zone}, $args{revrec});
+    ($code,$msg) = $dnsdb->delZone($args{zone}, $args{revrec});
   } else {
     my $zoneid;
-    $zoneid = DNSDB::domainID($dbh, $args{zone}) if $args{revrec} eq 'n';
-    $zoneid = DNSDB::revID($dbh, $args{zone}) if $args{revrec} eq 'y';
-    die "Can't find zone: $DNSDB::errstr\n" if !$zoneid;
-    ($code,$msg) = DNSDB::delZone($dbh, $zoneid, $args{revrec});
+    $zoneid = $dnsdb->domainID($args{zone}) if $args{revrec} eq 'n';
+    $zoneid = $dnsdb->revID($args{zone}) if $args{revrec} eq 'y';
+    die "Can't find zone: $dnsdb->errstr\n" if !$zoneid;
+    ($code,$msg) = $dnsdb->delZone($zoneid, $args{revrec});
   }
   die $msg if $code eq 'FAIL';
@@ -178 +178 @@
   _commoncheck(\%args, 'y');
 
-  my ($code, $msg) = DNSDB::addRDNS($dbh, $args{revzone}, $args{revpatt}, $args{group}, $args{state}, $args{defloc});
+  my ($code, $msg) = $dnsdb->addRDNS($args{revzone}, $args{revpatt}, $args{group}, $args{state}, $args{defloc});
   die "$msg\n" if $code eq 'FAIL';
   return $msg;  # domain ID
@@ -431 +431 @@
   my $cidr = new NetAddr::IP $args{cidr};
 
-  my $zonelist = DNSDB::getZonesByCIDR($dbh, %args);
+  my $zonelist = $dnsdb->getZonesByCIDR(%args);
   if (scalar(@$zonelist) == 0) {
     # enhh....  WTF?
@@ -511 +511 @@
 
   # much like addOrUpdateRevRec()
-  my $zonelist = DNSDB::getZonesByCIDR($dbh, %args);
+  my $zonelist = $dnsdb->getZonesByCIDR(%args);
   my $cidr = new NetAddr::IP $args{cidr};
 
@@ -633 +633 @@
   _commoncheck(\%args, 'y');
 
-  my @arglist = ($dbh, $args{zoneid});
+  my @arglist = ($args{zoneid});
   push @arglist, $args{status} if defined($args{status});
 
-  my $status = DNSDB::zoneStatus(@arglist);
+  my $status = $dnsdb->zoneStatus(@arglist);
 }
 
@@ -645 +645 @@
   _commoncheck(\%args, 'y');
 
-  return DNSDB::getZonesByCIDR($dbh, %args);
+  return $dnsdb->getZonesByCIDR(%args);
 }