Changeset 486

Timestamp:

03/15/13 12:42:45 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

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

• clean up a couple of missed method calls in dns.cgi and dns-rpc.cgi, and a couple of references to the obsoleted %config

Location:

trunk

Files:

• dns-rpc.cgi (modified) (4 diffs)
• dns.cgi (modified) (1 diff)

trunk/dns-rpc.cgi

@@ -91 +91 @@
 sub _aclcheck {
   my $subsys = shift;
-  return 1 if grep /$ENV{REMOTE_ADDR}/, @{$DNSDB::config{rpcacl}{$subsys}};
+  return 1 if grep /$ENV{REMOTE_ADDR}/, @{$dnsdb->{rpcacl}{$subsys}};
   return 0;
 }
@@ -105 +105 @@
     die "Missing remote username\n" if !$argref->{rpcuser};
     die "Couldn't set userdata for logging\n"
-        unless DNSDB::initRPC($dbh, (username => $argref->{rpcuser}, rpcsys => $argref->{rpcsystem},
-                fullname => ($argref->{fullname} ? $argref->{fullname} : $argref->{rpcuser}) ) );
+        unless $dnsdb->initRPC(username => $argref->{rpcuser}, rpcsys => $argref->{rpcsystem},
+                fullname => ($argref->{fullname} ? $argref->{fullname} : $argref->{rpcuser}) );
   }
 }
@@ -122 +122 @@
   my $argref = shift;
   if (!$argref->{ttl}) {
-    my $tmp = DNSDB::getSOA($dbh, $argref->{defrec}, $argref->{revrec}, $argref->{parent_id});
+    my $tmp = $dnsdb->getSOA($argref->{defrec}, $argref->{revrec}, $argref->{parent_id});
     $argref->{ttl} = $tmp->{minttl};
   }
@@ -216 +216 @@
     ($code,$msg) = $dnsdb->delGroup($args{group});
   } else {
-    my $grpid = DNSDB::groupID($dbh, $args{group});
+    my $grpid = $dnsdb->groupID($args{group});
     die "Can't find group\n" if !$grpid;
     ($code,$msg) = $dnsdb->delGroup($grpid);

trunk/dns.cgi

@@ -1935 +1935 @@
     $page->param(port   => $webvar{port}) if $webvar{type} == $reverse_typemap{SRV};
   } else {
-    my $domroot = ($webvar{defrec} eq 'y' ? 'ADMINDOMAIN' : ".$config{domain}");
+    my $domroot = ($webvar{defrec} eq 'y' ? 'ADMINDOMAIN' : ".$dnsdb->{domain}");
     $page->param(name   => ($webvar{name} ? $webvar{name} : $domroot));
     my $zname = ($webvar{defrec} eq 'y' ? 'ZONE' : $dnsdb->revName($webvar{parentid}));