Changeset 477 for trunk/dns.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.cgi (modified) (13 diffs)

trunk/dns.cgi

@@ -315 +315 @@
     }
     if ($flag && ($permissions{admin} || $permissions{domain_edit})) {
-      my $stat = zoneStatus($dbh,$webvar{id},'n',$webvar{zonestatus});
+      my $stat = $dnsdb->zoneStatus($webvar{id}, 'n', $webvar{zonestatus});
       $page->param(resultmsg => $DNSDB::resultstr);
     } else {
@@ -362 +362 @@
   $webvar{makeactive} = 0 if !defined($webvar{makeactive});
 
-  my ($code,$msg) = addDomain($dbh,$webvar{domain},$webvar{group},($webvar{makeactive} eq 'on' ? 1 : 0));
+  my ($code,$msg) = $dnsdb->addDomain($webvar{domain}, $webvar{group}, ($webvar{makeactive} eq 'on' ? 1 : 0));
 
   if ($code eq 'OK') {
@@ -396 +396 @@
   } elsif ($webvar{del} eq 'ok') {
     my $pargroup = $dnsdb->parentID(id => $webvar{id}, type => 'domain', revrec => $webvar{revrec});
-    my ($code,$msg) = delZone($dbh, $webvar{id}, $webvar{revrec});
+    my ($code,$msg) = $dnsdb->delZone($webvar{id}, $webvar{revrec});
     if ($code eq 'OK') {
       changepage(page => "domlist", resultmsg => $msg);
@@ -419 +419 @@
     }
     if ($flag && ($permissions{admin} || $permissions{domain_edit})) {
-      my $stat = zoneStatus($dbh,$webvar{id},'y',$webvar{zonestatus});
+      my $stat = $dnsdb->zoneStatus($webvar{id}, 'y', $webvar{zonestatus});
       $page->param(resultmsg => $DNSDB::resultstr);
     } else {
@@ -464 +464 @@
   }
 
-  my ($code,$msg) = addRDNS($dbh, $webvar{revzone}, $webvar{revpatt}, $webvar{group},
+  my ($code,$msg) = $dnsdb->addRDNS($webvar{revzone}, $webvar{revpatt}, $webvar{group},
         ($webvar{makeactive} eq 'on' ? 1 : 0), $webvar{location});
 
@@ -497 +497 @@
     my $pargroup = $dnsdb->parentID(id => $webvar{id}, type => 'revzone', revrec => $webvar{revrec});
     my $zone = $dnsdb->revName($webvar{id});
-    my ($code,$msg) = delZone($dbh, $webvar{id}, 'y');
+    my ($code,$msg) = $dnsdb->delZone($webvar{id}, 'y');
     if ($code eq 'OK') {
       changepage(page => "revzones", resultmsg => $msg);
@@ -625 +625 @@
 
     if ($webvar{defrec} eq 'n') {
-      my $defloc = getZoneLocation($dbh, $webvar{revrec}, $webvar{parentid});
+      my $defloc = $dnsdb->getZoneLocation($webvar{revrec}, $webvar{parentid});
       fill_loclist($curgroup, $defloc);
     }
@@ -635 +635 @@
 
     # location check - if user does not have record_locchg, set $webvar{location} to default location for zone
-    my $parloc = getZoneLocation($dbh, $webvar{revrec}, $webvar{parentid});
+    my $parloc = $dnsdb->getZoneLocation($webvar{revrec}, $webvar{parentid});
     $webvar{location} = $parloc unless ($permissions{admin} || $permissions{record_locchg});
 
@@ -993 +993 @@
   fill_grouplist("grouplist");
 
-  my $count = getZoneCount($dbh, (revrec => 'n', curgroup => $curgroup) );
+  my $count = $dnsdb->getZoneCount(revrec => 'n', curgroup => $curgroup);
 
   $page->param(curpage => $webvar{page});
@@ -1000 +1000 @@
   $page->param(perpage => $perpage);
 
-  my $domlist = getZoneList($dbh, (revrec => 'n', curgroup => $curgroup) );
+  my $domlist = $dnsdb->getZoneList(revrec => 'n', curgroup => $curgroup);
   my $rownum = 0;
   foreach my $dom (@{$domlist}) {
@@ -1063 +1063 @@
         if $webvar{bulkaction} eq 'move';
     if ($webvar{bulkaction} eq 'deactivate' || $webvar{bulkaction} eq 'activate') {
-      my $stat = zoneStatus($dbh,$webvar{$_},'n',($webvar{bulkaction} eq 'activate' ? 'domon' : 'domoff'));
+      my $stat = $dnsdb->zoneStatus($webvar{$_}, 'n', ($webvar{bulkaction} eq 'activate' ? 'domon' : 'domoff'));
       $code = (defined($stat) ? 'OK' : 'FAIL');
       $msg = (defined($stat) ? $DNSDB::resultstr : $DNSDB::errstr);
     }
-    ($code, $msg) = delZone($dbh, $webvar{$_}, 'n')
+    ($code, $msg) = $dnsdb->delZone($webvar{$_}, 'n')
         if $webvar{bulkaction} eq 'delete';
 
@@ -2035 +2035 @@
   my $childlist = join(',',@childgroups);
 
-  my $count = getZoneCount($dbh, (childlist => $childlist, curgroup => $curgroup, revrec => $webvar{revrec},
-        filter => ($filter ? $filter : undef), startwith => ($startwith ? $startwith : undef) ) );
+  my $count = $dnsdb->getZoneCount(childlist => $childlist, curgroup => $curgroup, revrec => $webvar{revrec},
+        filter => ($filter ? $filter : undef), startwith => ($startwith ? $startwith : undef) );
 
 # fill page count and first-previous-next-last-all bits
@@ -2067 +2067 @@
   $page->param(group => $curgroup);
 
-  my $zonelist = getZoneList($dbh, (childlist => $childlist, curgroup => $curgroup,
-        revrec => $webvar{revrec},
+  my $zonelist = $dnsdb->getZoneList(childlist => $childlist, curgroup => $curgroup, revrec => $webvar{revrec},
         filter => ($filter ? $filter : undef), startwith => ($startwith ? $startwith : undef),
         offset => $webvar{offset}, sortby => $sortby, sortorder => $sortorder
-        ) );
+        );
 # probably don't need this, keeping for reference for now
 #  foreach (@$zonelist) {