Changeset 481 for trunk/dns.cgi

Timestamp:

03/14/13 15:33:42 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

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

• record manipulation: getSOA(), getRecLine(), getDomRecs(), getRecCount(), addRec(), updateRec(), downconvert(), and delRec() and callers.

File:

• trunk/dns.cgi (modified) (12 diffs)

trunk/dns.cgi

@@ -443 +443 @@
 
   # prepopulate revpatt with the matching default record
-# getRecByName($dbh, (revrec => $webvar{revrec}, defrec => $webvar{defrec}, host => 'string'));
+# $dnsdb->getRecByName(revrec => $webvar{revrec}, defrec => $webvar{defrec}, host => 'string');
 
   if ($session->param('add_failed')) {
@@ -543 +543 @@
     $page->param(curpage => $webvar{page});
 
-    my $count = getRecCount($dbh, $webvar{defrec}, $webvar{revrec}, $webvar{id}, $filter);
+    my $count = $dnsdb->getRecCount($webvar{defrec}, $webvar{revrec}, $webvar{id}, $filter);
 
     $sortby = 'host';
@@ -638 +638 @@
     $webvar{location} = $parloc unless ($permissions{admin} || $permissions{record_locchg});
 
-    my @recargs = ($dbh,$webvar{defrec},$webvar{revrec},$webvar{parentid},
-        \$webvar{name},\$webvar{type},\$webvar{address},$webvar{ttl},$webvar{location});
+    my @recargs = ($webvar{defrec}, $webvar{revrec}, $webvar{parentid},
+        \$webvar{name}, \$webvar{type}, \$webvar{address}, $webvar{ttl}, $webvar{location});
     if ($webvar{type} == $reverse_typemap{MX} or $webvar{type} == $reverse_typemap{SRV}) {
       push @recargs, $webvar{distance};
@@ -648 +648 @@
     }
 
-    my ($code,$msg) = addRec(@recargs);
+    my ($code,$msg) = $dnsdb->addRec(@recargs);
 
     if ($code eq 'OK' || $code eq 'WARN') {
@@ -679 +679 @@
     $page->param(parentid       => $webvar{parentid});
     $page->param(id             => $webvar{id});
-    my $recdata = getRecLine($dbh, $webvar{defrec}, $webvar{revrec}, $webvar{id});
+    my $recdata = $dnsdb->getRecLine($webvar{defrec}, $webvar{revrec}, $webvar{id});
     $page->param(name           => $recdata->{host});
     $page->param(address        => $recdata->{val});
@@ -698 +698 @@
 
     # retain old location if user doesn't have permission to fiddle locations
-    my $oldrec = getRecLine($dbh, $webvar{defrec}, $webvar{revrec}, $webvar{id});
+    my $oldrec = $dnsdb->getRecLine($webvar{defrec}, $webvar{revrec}, $webvar{id});
     $webvar{location} = $oldrec->{location} unless ($permissions{admin} || $permissions{record_locchg});
 
-    my ($code,$msg) = updateRec($dbh,$webvar{defrec},$webvar{revrec},$webvar{id},$webvar{parentid},
-        \$webvar{name},\$webvar{type},\$webvar{address},$webvar{ttl},$webvar{location},
-        $webvar{distance},$webvar{weight},$webvar{port});
+    my ($code,$msg) = $dnsdb->updateRec($webvar{defrec}, $webvar{revrec}, $webvar{id}, $webvar{parentid},
+        \$webvar{name}, \$webvar{type}, \$webvar{address}, $webvar{ttl}, $webvar{location},
+        $webvar{distance}, $webvar{weight}, $webvar{port});
 
     if ($code eq 'OK' || $code eq 'WARN') {
@@ -756 +756 @@
   if (!defined($webvar{del})) {
     $page->param(del_getconf => 1);
-    my $rec = getRecLine($dbh, $webvar{defrec}, $webvar{revrec}, $webvar{id});
+    my $rec = $dnsdb->getRecLine($webvar{defrec}, $webvar{revrec}, $webvar{id});
     $page->param(host => $rec->{host});
     $page->param(ftype => $typemap{$rec->{type}});
     $page->param(recval => $rec->{val});
   } elsif ($webvar{del} eq 'ok') {
-    my ($code,$msg) = delRec($dbh, $webvar{defrec}, $webvar{revrec}, $webvar{id});
+    my ($code,$msg) = $dnsdb->delRec($webvar{defrec}, $webvar{revrec}, $webvar{id});
     if ($code eq 'OK') {
       changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec},
@@ -816 +816 @@
         unless ($permissions{admin} || $permissions{domain_edit});
 
-  my ($code, $msg) = updateSOA($dbh, $webvar{defrec}, $webvar{revrec},
+  my ($code, $msg) = $dnsdb->updateSOA($webvar{defrec}, $webvar{revrec},
         (contact => $webvar{contact}, prins => $webvar{prins}, refresh => $webvar{refresh},
         retry => $webvar{retry}, expire => $webvar{expire}, minttl => $webvar{minttl},
@@ -1863 +1863 @@
   if ($preserve eq 'd') {
     # there are probably better ways to do this.  TMTOWTDI.
-    my $soa = getSOA($dbh,$defrec,$revrec,$id);
+    my $soa = $dnsdb->getSOA($defrec, $revrec, $id);
 
     $page->param(prins  => ($soa->{prins} ? $soa->{prins} : $DNSDB::def{prins}));
@@ -1889 +1889 @@
 
   # get the SOA first
-  my $soa = getSOA($dbh,$def,$rev,$id);
+  my $soa = $dnsdb->getSOA($def, $rev, $id);
 
   $page->param(contact  => $soa->{contact});
@@ -1899 +1899 @@
   $page->param(ttl      => $soa->{ttl});
 
-  my $foo2 = getDomRecs($dbh,(defrec => $def, revrec => $rev, id => $id, offset => $webvar{offset},
-        sortby => $sortby, sortorder => $sortorder, filter => $filter));
+  my $foo2 = $dnsdb->getDomRecs(defrec => $def, revrec => $rev, id => $id, offset => $webvar{offset},
+        sortby => $sortby, sortorder => $sortorder, filter => $filter);
 
   foreach my $rec (@$foo2) {
@@ -1941 +1941 @@
   }
 # retrieve the right ttl instead of falling (way) back to the hardcoded system default
-  my $soa = getSOA($dbh,$webvar{defrec},$webvar{revrec},$webvar{parentid});
+  my $soa = $dnsdb->getSOA($webvar{defrec}, $webvar{revrec}, $webvar{parentid});
   $page->param(ttl      => ($webvar{ttl} ? $webvar{ttl} : $soa->{minttl}));
 }