Changeset 547

Timestamp:

12/11/13 15:45:18 (11 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge reverse DNS work and object conversion from /trunk, 4 of mumble

Includes changes through r492 with a few minor conflicts.

Location:

branches/stable

Files:

• . (modified) (1 prop)
• DNSDB.pm (modified) (199 diffs)
• compact-recs.pl (copied) (copied from trunk/compact-recs.pl )
• dns-1.0-1.2.sql (modified) (4 diffs)
• dns-rpc.cgi (modified) (25 diffs)
• dns.cgi (modified) (82 diffs)
• dns.sql (modified) (4 diffs)
• export.pl (modified) (1 diff)
• templates/bulkdomain.tmpl (modified) (1 diff)
• templates/newrevzone.tmpl (modified) (1 diff)
• textrecs.cgi (modified) (3 diffs)
• tiny-import.pl (modified) (16 diffs)
• vega-import.pl (modified) (2 diffs)

branches/stable/DNSDB.pm

@@ -38 +38 @@
 @EXPORT_OK      = qw(
         &initGlobals &login &initActionLog
-        &initPermissions &getPermissions &changePermissions &comparePermissions
+        &getPermissions &changePermissions &comparePermissions
         &changeGroup
         &loadConfig &connectDB &finish
@@ -52 +52 @@
         &addRec &updateRec &delRec
         &getLogCount &getLogEntries
+        &getRevPattern
         &getTypelist
         &parentID
         &isParent
-        &zoneStatus &importAXFR
+        &zoneStatus &getZonesByCIDR &importAXFR
         &export
         &mailNotify
         %typemap %reverse_typemap %config
-        %permissions @permtypes $permlist %permchains
+        @permtypes $permlist %permchains
         );
 
-@EXPORT         = (); # Export nothing by default.
+@EXPORT         = qw(%typemap %reverse_typemap @permtypes $permlist %permchains);
 %EXPORT_TAGS    = ( ALL => [qw(
                 &initGlobals &login &initActionLog
-                &initPermissions &getPermissions &changePermissions &comparePermissions
+                &getPermissions &changePermissions &comparePermissions
                 &changeGroup
                 &loadConfig &connectDB &finish
@@ -79 +80 @@
                 &addRec &updateRec &delRec
                 &getLogCount &getLogEntries
+                &getRevPattern
                 &getTypelist
                 &parentID
                 &isParent
-                &zoneStatus &importAXFR
+                &zoneStatus &getZonesByCIDR &importAXFR
                 &export
                 &mailNotify
                 %typemap %reverse_typemap %config
-                %permissions @permtypes $permlist %permchains
+                @permtypes $permlist %permchains
                 )]
         );
 
-our $group = 1;
 our $errstr = '';
 our $resultstr = '';
@@ -135 +136 @@
 our %reverse_typemap;
 
-our %permissions;
-
 # Prepopulate a basic config.  Note some of these *will* cause errors if left unset.
 # note:  add appropriate stanzas in loadConfig to parse these
@@ -167 +166 @@
                 log_failures    => 1,   # log all evarthing by default
                 perpage         => 15,
+                maxfcgi         => 100, # reasonable default?
         );
 
@@ -174 +174 @@
 # it relies on visibility flags from the rectypes table in the DB
 my %validators;
-
-# Username, full name, ID - mainly for logging
-my %userdata;
 
 # Entity-relationship reference hashes.
@@ -217 +214 @@
 
 ##
+## Constructor and destructor
+##
+
+sub new {
+  my $this = shift;
+  my $class = ref($this) || $this;
+  my %args = @_;
+##fixme?  to ponder:  do we do some magic if the caller sets eg dbname to prevent parsing of the config file?
+  if (!loadConfig(basename => $args{configfile})) {
+    warn "Using default configuration;  unable to load custom settings: $errstr\n";
+  }
+  my $self = \%config;
+  $self->{configfile} = $args{configfile};
+  bless $self, $class;
+  $self->{dbh} = connectDB($self->{dbname}, $self->{dbuser}, $self->{dbpass}, $self->{dbhost}) or return;
+  $self->initGlobals();
+
+  return $self;
+}
+
+sub DESTROY {
+  my $self = shift;
+  $self->{dbh}->disconnect;
+}
+
+##
 ## utility functions
 ##
@@ -244 +267 @@
 ## DNSDB::_ipparent()
 # Check an IP to be added in a reverse zone to see if it's really in the requested parent.
-# Takes a database handle, default and reverse flags, IP (fragment) to check, parent zone ID,
+# Takes default and reverse flags, IP (fragment) to check, parent zone ID,
 # and a reference to a NetAddr::IP object (also used to pass back a fully-reconstructed IP for
 # database insertion)
 sub _ipparent {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $defrec = shift;
   my $revrec = shift;
@@ -309 +333 @@
 ## DNSDB::_hostparent()
 # A little different than _ipparent above;  this tries to *find* the parent zone of a hostname
-# Takes a database handle and hostname.
+# Takes a hostname.
 # Returns the domain ID of the parent domain if one was found.
 sub _hostparent {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $hname = shift;
 
@@ -330 +355 @@
 ## DNSDB::_log()
 # Log an action
-# Takes a database handle and log entry hash containing at least:
+# Takes a log entry hash containing at least:
 #  group_id, log entry
 # and optionally one or more of:
@@ -336 +361 @@
 # The %userdata hash provides the user ID, username, and fullname
 sub _log {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
   my %args = @_;
@@ -348 +374 @@
         undef,
         ($args{domain_id}, $args{rdns_id}, $args{group_id}, $args{entry},
-                $userdata{userid}, $userdata{username}, $userdata{fullname}) );
+                $self->{loguserid}, $self->{logusername}, $self->{logfullname}) );
 #  } elsif ($config{log_channel} eq 'file') {
 #  } elsif ($config{log_channel} eq 'syslog') {
@@ -360 +386 @@
 
 ## All of these subs take substantially the same arguments:
-# a database handle
 # a hash containing at least the following keys:
 #  - defrec (default/live flag)
@@ -374 +399 @@
 # A record
 sub _validate_1 {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
   my %args = @_;
@@ -382 +408 @@
   # Coerce all hostnames to end in ".DOMAIN" for group/default records,
   # or the intended parent domain for live records.
-  my $pname = ($args{defrec} eq 'y' ? 'DOMAIN' : domainName($dbh,$args{id}));
+  my $pname = ($args{defrec} eq 'y' ? 'DOMAIN' : $self->domainName($args{id}));
   ${$args{host}} =~ s/\.*$/\.$pname/ if ${$args{host}} !~ /$pname$/;
 
@@ -399 +425 @@
 # NS record
 sub _validate_2 {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
   my %args = @_;
@@ -409 +436 @@
     if ($args{revrec} eq 'y') {
       my $tmpip = NetAddr::IP->new(${$args{val}});
-      my $pname = revName($dbh,$args{id});
+      my $pname = $self->revName($args{id});
       return ('FAIL',"${$args{val}} not within $pname")
-         unless _ipparent($dbh, $args{defrec}, $args{revrec}, $args{val}, $args{id}, \$tmpip);
+         unless $self->_ipparent($args{defrec}, $args{revrec}, $args{val}, $args{id}, \$tmpip);
       # Sub the returned thing for ZONE?  This could get stupid if you have typos...
       ${$args{val}} =~ s/ZONE/$tmpip->address/;
     } else {
-      my $pname = domainName($dbh,$args{id});
+      my $pname = $self->domainName($args{id});
       ${$args{host}} = $pname if ${$args{host}} !~ /\.$pname$/;
     }
@@ -436 +463 @@
 # CNAME record
 sub _validate_5 {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
   my %args = @_;
@@ -447 +475 @@
   # Coerce all hostnames to end in ".DOMAIN" for group/default records,
   # or the intended parent domain for live records.
-  my $pname = ($args{defrec} eq 'y' ? 'DOMAIN' : domainName($dbh,$args{id}));
+  my $pname = ($args{defrec} eq 'y' ? 'DOMAIN' : $self->domainName($args{id}));
   ${$args{host}} =~ s/\.*$/\.$pname/ if ${$args{host}} !~ /$pname$/;
 
@@ -462 +490 @@
 # PTR record
 sub _validate_12 {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
   my %args = @_;
@@ -468 +497 @@
   if ($args{revrec} eq 'y') {
     if ($args{defrec} eq 'n') {
-      return ('FAIL', "IP or IP fragment ${$args{val}} is not within ".revName($dbh, $args{id}))
-        unless _ipparent($dbh, $args{defrec}, $args{revrec}, $args{val}, $args{id}, \$args{addr});
+      return ('FAIL', "IP or IP fragment ${$args{val}} is not within ".$self->revName($args{id}))
+        unless $self->_ipparent($args{defrec}, $args{revrec}, $args{val}, $args{id}, \$args{addr});
       ${$args{val}} = $args{addr}->addr;
     } else {
@@ -542 +571 @@
 # MX record
 sub _validate_15 {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
   my %args = @_;
@@ -558 +588 @@
   # Coerce all hostnames to end in ".DOMAIN" for group/default records,
   # or the intended parent domain for live records.
-  my $pname = ($args{defrec} eq 'y' ? 'DOMAIN' : domainName($dbh,$args{id}));
+  my $pname = ($args{defrec} eq 'y' ? 'DOMAIN' : $self->domainName($args{id}));
   ${$args{host}} =~ s/\.*$/\.$pname/ if ${$args{host}} !~ /$pname$/;
 
@@ -585 +615 @@
 # AAAA record
 sub _validate_28 {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
   my %args = @_;
@@ -593 +624 @@
   # Coerce all hostnames to end in ".DOMAIN" for group/default records,
   # or the intended parent domain for live records.
-  my $pname = ($args{defrec} eq 'y' ? 'DOMAIN' : domainName($dbh,$args{id}));
+  my $pname = ($args{defrec} eq 'y' ? 'DOMAIN' : $self->domainName($args{id}));
   ${$args{host}} =~ s/\.*$/\.$pname/ if ${$args{host}} !~ /$pname$/;
 
@@ -607 +638 @@
 # SRV record
 sub _validate_33 {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
   my %args = @_;
@@ -633 +665 @@
   # Coerce all hostnames to end in ".DOMAIN" for group/default records,
   # or the intended parent domain for live records.
-  my $pname = ($args{defrec} eq 'y' ? 'DOMAIN' : domainName($dbh,$args{id}));
+  my $pname = ($args{defrec} eq 'y' ? 'DOMAIN' : $self->domainName($args{id}));
   ${$args{host}} =~ s/\.*$/\.$pname/ if ${$args{host}} !~ /$pname$/;
 
@@ -643 +675 @@
 # A+PTR record.  With a very little bit of magic we can also use this sub to validate AAAA+PTR.  Whee!
 sub _validate_65280 {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
   my %args = @_;
@@ -654 +687 @@
 
     if ($args{revrec} eq 'y') {
-      ($code,$msg) = _validate_12($dbh, %args);
+      ($code,$msg) = $self->_validate_12(%args);
       return ($code,$msg) if $code eq 'FAIL';
 
+      # check A+PTR is really v4
+      return ('FAIL',"$typemap{${$args{rectype}}} record must be a valid IPv4 address")
+        if ${$args{rectype}} == 65280 && $args{addr}->{isv6};
+      # check AAAA+PTR is really v6
+      return ('FAIL',"$typemap{${$args{rectype}}} record must be a valid IPv6 address")
+        if ${$args{rectype}} == 65281 && !$args{addr}->{isv6};
+
       # Check if the reqested domain exists.  If not, coerce the type down to PTR and warn.
-      if (!(${$args{domid}} = _hostparent($dbh, ${$args{host}}))) {
+      if (!(${$args{domid}} = $self->_hostparent(${$args{host}}))) {
         my $addmsg = "Record ".($args{update} ? 'updated' : 'added').
                 " as PTR instead of $typemap{${$args{rectype}}};  domain not found for ${$args{host}}";
@@ -672 +712 @@
 
     } else {
-      ($code,$msg) = _validate_1($dbh, %args) if ${$args{rectype}} == 65280;
-      ($code,$msg) = _validate_28($dbh, %args) if ${$args{rectype}} == 65281;
+      ($code,$msg) = $self->_validate_1(%args) if ${$args{rectype}} == 65280;
+      ($code,$msg) = $self->_validate_28(%args) if ${$args{rectype}} == 65281;
       return ($code,$msg) if $code eq 'FAIL';
 
@@ -722 +762 @@
   } else {      # defrec eq 'y'
     if ($args{revrec} eq 'y') {
-      ($code,$msg) = _validate_12($dbh, %args);
+      ($code,$msg) = $self->_validate_12(%args);
       return ($code,$msg) if $code eq 'FAIL';
       if (${$args{rectype}} == 65280) {
@@ -754 +794 @@
 # PTR template record
 sub _validate_65282 {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
   my %args = @_;
@@ -761 +802 @@
   if ($args{revrec} eq 'y') {
     if ($args{defrec} eq 'n') {
-      return ('FAIL', "Template block ${$args{val}} is not within ".revName($dbh, $args{id}))
-        unless _ipparent($dbh, $args{defrec}, $args{revrec}, $args{val}, $args{id}, \$args{addr});
+      return ('FAIL', "Template block ${$args{val}} is not within ".$self->revName($args{id}))
+        unless $self->_ipparent($args{defrec}, $args{revrec}, $args{val}, $args{id}, \$args{addr});
 ##fixme:  warn if $args{val} is not /31 or larger block?
       ${$args{val}} = "$args{addr}";
@@ -821 +862 @@
       $pcsth->execute($checkme);
       my ($rc) = $pcsth->fetchrow_array;
-      return ('FAIL', "Only one template pseudorecord may exist for a given IP block") if $rc;
+      return ('FAIL', "Only one template pseudorecord may exist for a given IP block") if $rc > 1;
     }
 
@@ -833 +874 @@
 # A+PTR template record
 sub _validate_65283 {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
   my %args = @_;
@@ -843 +885 @@
   if ($args{defrec} eq 'n') {
     if ($args{revrec} eq 'n') {
-      ($code,$msg) = _validate_1($dbh, %args) if ${$args{rectype}} == 65280;
-      ($code,$msg) = _validate_28($dbh, %args) if ${$args{rectype}} == 65281;
+      ($code,$msg) = $self->_validate_1(%args) if ${$args{rectype}} == 65280;
+      ($code,$msg) = $self->_validate_28(%args) if ${$args{rectype}} == 65281;
       return ($code,$msg) if $code eq 'FAIL';
 
@@ -866 +908 @@
 
     } else {
-      return ('FAIL', "IP or IP fragment ${$args{val}} is not within ".revName($dbh, $args{id}))
-        unless _ipparent($dbh, $args{defrec}, $args{revrec}, $args{val}, $args{id}, \$args{addr});
+      return ('FAIL', "IP or IP fragment ${$args{val}} is not within ".$self->revName($args{id}))
+        unless $self->_ipparent($args{defrec}, $args{revrec}, $args{val}, $args{id}, \$args{addr});
       ${$args{val}} = "$args{addr}";
 
-      if (!(${$args{domid}} = _hostparent($dbh, ${$args{host}}))) {
+      if (!(${$args{domid}} = $self->_hostparent(${$args{host}}))) {
         my $addmsg = "Record ".($args{update} ? 'updated' : 'added').
                 " as PTR template instead of $typemap{${$args{rectype}}};  domain not found for ${$args{host}}";
@@ -885 +927 @@
 
   } else {
-    my ($code,$msg) = _validate_65282($dbh, %args);
+    my ($code,$msg) = $self->_validate_65282(%args);
     return ($code, $msg) if $code eq 'FAIL';
     # get domain, check against ${$args{name}}
@@ -902 +944 @@
 # for delegating IPv4 sub-/24 reverse blocks
 sub _validate_65285 {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
   my %args = @_;
@@ -914 +957 @@
     if ($args{revrec} eq 'y') {
       my $tmpip = NetAddr::IP->new(${$args{val}});
-      my $pname = revName($dbh,$args{id});
+      my $pname = $self->revName($args{id});
       return ('FAIL',"${$args{val}} not within $pname")
-         unless _ipparent($dbh, $args{defrec}, $args{revrec}, $args{val}, $args{id}, \$tmpip);
+         unless $self->_ipparent($args{defrec}, $args{revrec}, $args{val}, $args{id}, \$tmpip);
       # Normalize
       ${$args{val}} = "$tmpip";
     } else {
-      my $pname = domainName($dbh,$args{id});
+      my $pname = $self->domainName($args{id});
       ${$args{host}} =~ s/\.*$/\.$pname/ if ${$args{host}} !~ /$pname$/;
     }
@@ -1153 +1196 @@
   for (@ipparts) {
     push @iphex, sprintf("%x", $_);
-    push @ippad, sprintf("%u.3", $_);
+    push @ippad, sprintf("%0.3u", $_);
   }
 
@@ -1186 +1229 @@
   $$tmpl =~ s/\%([1234])d/$ipparts[$1-1]/g;
   $$tmpl =~ s/\%([1234])h/$iphex[$1-1]/g;
-  $$tmpl =~ s/\%([1234])h/$ippad[$1-1]/g;
+  $$tmpl =~ s/\%([1234])0/$ippad[$1-1]/g;
 } # _template4_expand()
 
@@ -1193 +1236 @@
 ## Initialization and cleanup subs
 ##
-
 
 ## DNSDB::loadConfig()
@@ -1200 +1242 @@
 # Takes an optional hash that may contain:
 #  - basename and config path to look for
-#  - RPC flag (saves parsing the more complex RPC bits if not needed)
 # Populates the %config and %def hashes
 sub loadConfig {
   my %args = @_;
-  $args{basename} = '' if !$args{basename};
-  $args{rpcflag} = '' if !$args{rpcflag};
-##fixme  $args{basename} isn't doing what I think I thought I was trying to do.
+  $args{configfile} = '' if !$args{configfile};
+
+##fixme  this is *intended* to load a system-default config template, and allow
+# overriding on a per-tool or per-web-UI-instance basis with a secondary config
+# file.  The "default" config file can't be deleted in the current form.
 
   my $deferr = '';      # place to put error from default config file in case we can't find either one
 
   my $configroot = "/etc/dnsdb";        ##CFG_LEAF##
-  $configroot = '' if $args{basename} =~ m|^/|;
-  $args{basename} .= ".conf" if $args{basename} !~ /\.conf$/;
+  $configroot = '' if $args{configfile} =~ m|^/|;  # allow passed siteconfig to specify an arbitrary absolute path
+  $args{configfile} .= ".conf" if $args{configfile} !~ /\.conf$/;
   my $defconfig = "$configroot/dnsdb.conf";
-  my $siteconfig = "$configroot/$args{basename}";
+  my $siteconfig = "$configroot/$args{configfile}";
 
   # System defaults
-  __cfgload("$defconfig", $args{rpcflag}) or $deferr = $errstr;
+  __cfgload("$defconfig") or $deferr = $errstr;
 
   # Per-site-ish settings.
-  if ($args{basename} ne '.conf') {
-    unless (__cfgload("$siteconfig"), $args{rpcflag}) {
+  if ($args{configfile} ne '.conf') {
+    unless (__cfgload("$siteconfig")) {
       $errstr = ($deferr ? "Error opening default config file $defconfig: $deferr\n" : '').
         "Error opening site config file $siteconfig";
@@ -1253 +1296 @@
 ## DNSDB::__cfgload()
 # Private sub to parse a config file and load it into %config
-# Takes a file handle on an open config file
+# Takes a filename
 sub __cfgload {
   $errstr = '';
   my $cfgfile = shift;
-  my $rpcflag = shift;
 
   if (open CFG, "<$cfgfile") {
@@ -1296 +1338 @@
       $config{exportcache}      = $1 if m{^exportcache\s*=\s*([a-z0-9/_.-]+)}i;
       # RPC options
-      if ($rpcflag && /^rpc/) {
-        if (my ($tmp) = /^rpc_iplist\s*=\s*(.+)/i) {
-          my @ips = split /[,\s]+/, $tmp;
-          my $rpcsys = shift @ips;
-          push @{$config{rpcacl}{$rpcsys}}, @ips;
-        }
+      $config{rpcmode}          = $1 if /^rpc_mode\s*=\s*(socket|HTTP|XMLRPC)\s*$/i;
+      $config{maxfcgi}          = $1 if /^max_fcgi_requests\s*=\s*(\d+)\s*$/i;
+      if (my ($tmp) = /^rpc_iplist\s*=\s*(.+)/i) {
+        my @ips = split /[,\s]+/, $tmp;
+        my $rpcsys = shift @ips;
+        push @{$config{rpcacl}{$rpcsys}}, @ips;
       }
     }
@@ -1316 +1358 @@
 # Creates connection to DNS database.
 # Requires the database name, username, and password.
-# Returns a handle to the db.
+# Returns a handle to the db or undef on failure.
 # Set up for a PostgreSQL db;  could be any transactional DBMS with the
 # right changes.
+# Called by new();  not intended to be called publicly.
 sub connectDB {
   $errstr = '';
@@ -1335 +1378 @@
         AutoCommit => 1,
         PrintError => 0
-        })
-    or return (undef, $DBI::errstr) if(!$dbh);
-
+        });
+  if (!$dbh) {
+    $errstr = $DBI::errstr;
+    return;
+  }
+#) if(!$dbh);
+
+  local $dbh->{RaiseError} = 1;
+
+  eval {
 ##fixme:  initialize the DB if we can't find the table (since, by definition, there's
 # nothing there if we can't select from it...)
-  my $tblsth = $dbh->prepare("SELECT count(*) FROM pg_catalog.pg_class WHERE relkind='r' AND relname=?");
-  my ($tblcount) = $dbh->selectrow_array($tblsth, undef, ('misc'));
-  return (undef,$DBI::errstr) if $dbh->err;
+    my $tblsth = $dbh->prepare("SELECT count(*) FROM pg_catalog.pg_class WHERE relkind='r' AND relname=?");
+    my ($tblcount) = $dbh->selectrow_array($tblsth, undef, ('misc'));
+#  return (undef,$DBI::errstr) if $dbh->err;
 
 #if ($tblcount == 0) {
@@ -1349 +1399 @@
 #}
 
-
 # Return here if we can't select.
 # This should retrieve the dbversion key.
-  my $sth = $dbh->prepare("SELECT key,value FROM misc WHERE misc_id=1");
-  $sth->execute();
-  return (undef,$DBI::errstr) if ($sth->err);
+    my $sth = $dbh->prepare("SELECT key,value FROM misc WHERE misc_id=1");
+    $sth->execute();
+#  return (undef,$DBI::errstr) if ($sth->err);
 
 ##fixme:  do stuff to the DB on version mismatch
@@ -1363 +1412 @@
 # See if the select returned anything (or null data).  This should
 # succeed if the select executed, but...
-  $sth->fetchrow();
-  return (undef,$DBI::errstr)  if ($sth->err);
-
-  $sth->finish;
+    $sth->fetchrow();
+#  return (undef,$DBI::errstr)  if ($sth->err);
+
+    $sth->finish;
+
+  }; # wrapped DB checks
+  if ($@) {
+    $errstr = $@;
+    return;
+  }
 
 # If we get here, we should be OK.
-  return ($dbh,"DB connection OK");
+  return $dbh;
 } # end connectDB
 
@@ -1377 +1432 @@
 # Requires a database handle
 sub finish {
-  my $dbh = $_[0];
-  $dbh->disconnect;
+  my $self = shift;
+  $self->{dbh}->disconnect;
 } # end finish
 
@@ -1385 +1440 @@
 # Initialize global variables
 # NB: this does NOT include web-specific session variables!
-# Requires a database handle
 sub initGlobals {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
 # load record types from database
@@ -1408 +1463 @@
 
 ## DNSDB::initRPC()
-# Takes a database handle, remote username, and remote fullname.
+# Takes a remote username and remote fullname.
 # Sets up the RPC logging-pseudouser if needed.
 # Sets the %userdata hash for logging.
 # Returns undef on failure
 sub initRPC {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my %args  = @_;
 
@@ -1429 +1485 @@
         " FROM users WHERE username=?", undef, ($args{username}) );
   }
-  %userdata = %{$tmpuser};
-  $userdata{lastname} = '' if !$userdata{lastname};
-  $userdata{fullname} = "$userdata{firstname} $userdata{lastname} ($args{rpcsys})";
+  $tmpuser->{lastname} = '' if !$tmpuser->{lastname};
+  $self->{loguserid} = $tmpuser->{userid};
+  $self->{logusername} = $tmpuser->{username};
+  $self->{logfullname} = "$tmpuser->{firstname} $tmpuser->{lastname} ($args{rpcsys})";
   return 1 if $tmpuser;
 } # end initRPC()
@@ -1442 +1499 @@
 # Returns undef otherwise
 sub login {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $user = shift;
   my $pass = shift;
@@ -1476 +1534 @@
 # See https://secure.deepnet.cx/trac/dnsadmin/ticket/21
 sub initActionLog {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $uid = shift;
 
@@ -1488 +1547 @@
 ##fixme: errors are unpossible!
 
-  $userdata{username} = $username;
-  $userdata{userid} = $uid;
-  $userdata{fullname} = $fullname;
+  $self->{logusername} = $username;
+  $self->{loguserid} = $uid;
+  $self->{logfullname} = $fullname;
 
   # convert to real check once we have other logging channels
@@ -1500 +1559 @@
 
 
-## DNSDB::initPermissions()
-# Set up permissions global
-# Takes database handle and UID
-sub initPermissions {
-  my $dbh = shift;
-  my $uid = shift;
-
-#  %permissions = $(getPermissions($dbh,'user',$uid));
-  getPermissions($dbh, 'user', $uid, \%permissions);
-
-} # end initPermissions()
-
-
 ## DNSDB::getPermissions()
 # Get permissions from DB
 # Requires DB handle, group or user flag, ID, and hashref.
 sub getPermissions {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
+
   my $type = shift;
   my $id = shift;
@@ -1567 +1615 @@
 # Takes a db handle, type, owner-id, and hashref for the changed permissions.
 sub changePermissions {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $type = shift;
   my $id = shift;
@@ -1632 +1681 @@
       $resultmsg = "Updated default permissions for group $name";
     }
-    _log($dbh, (group_id => ($type eq 'user' ? $parid : $id), entry => $resultmsg));
+    $self->_log(group_id => ($type eq 'user' ? $parid : $id), entry => $resultmsg);
     $dbh->commit;
   }; # end eval
@@ -1681 +1730 @@
 # Takes a database handle, entity type, entity ID, and new group ID
 sub changeGroup {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $type = shift;
   my $id = shift;
@@ -1695 +1745 @@
   my $entname;
   if ($type eq 'domain') {
-    $entname = domainName($dbh, $id);
+    $entname = $self->domainName($id);
   } elsif ($type eq 'revzone') {
-    $entname = revName($dbh, $id);
+    $entname = $self->revName($id);
   } elsif ($type eq 'user') {
-    $entname = userFullName($dbh, $id, '%u');
+    $entname = $self->userFullName($id, '%u');
   } elsif ($type eq 'group') {
-    $entname = groupName($dbh, $id);
+    $entname = $self->groupName($id);
   }
 
   my ($oldgid) = $dbh->selectrow_array("SELECT group_id FROM $par_tbl{$type} WHERE $id_col{$type}=?",
         undef, ($id));
-  my $oldgname = groupName($dbh, $oldgid);
-  my $newgname = groupName($dbh, $newgrp);
+  my $oldgname = $self->groupName($oldgid);
+  my $newgname = $self->groupName($newgrp);
 
   return ('FAIL', "Can't move things into a group that doesn't exist") if !$newgname;
@@ -1721 +1771 @@
     $dbh->do("UPDATE $par_tbl{$type} SET group_id=? WHERE $id_col{$type}=?", undef, ($newgrp, $id));
     # Log the change in both the old and new groups
-    _log($dbh, (group_id => $oldgid, entry => "Moved $type $entname from $oldgname to $newgname"));
-    _log($dbh, (group_id => $newgrp, entry => "Moved $type $entname from $oldgname to $newgname"));
+    $self->_log(group_id => $oldgid, entry => "Moved $type $entname from $oldgname to $newgname");
+    $self->_log(group_id => $newgrp, entry => "Moved $type $entname from $oldgname to $newgname");
     $dbh->commit;
   };
@@ -1729 +1779 @@
     eval { $dbh->rollback; };
     if ($config{log_failures}) {
-      _log($dbh, (group_id => $oldgid, entry => "Error moving $type $entname to $newgname: $msg"));
+      $self->_log(group_id => $oldgid, entry => "Error moving $type $entname to $newgname: $msg");
       $dbh->commit;     # since we enabled transactions earlier
     }
@@ -1750 +1800 @@
 sub addDomain {
   $errstr = '';
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   return ('FAIL',"Need database handle") if !$dbh;
   my $domain = shift;
@@ -1791 +1842 @@
         undef, ($domain));
 
-    _log($dbh, (domain_id => $dom_id, group_id => $group,
-        entry => "Added ".($state ? 'active' : 'inactive')." domain $domain"));
+    $self->_log(domain_id => $dom_id, group_id => $group,
+        entry => "Added ".($state ? 'active' : 'inactive')." domain $domain");
 
     # ... and now we construct the standard records from the default set.  NB:  group should be variable.
@@ -1806 +1857 @@
         my @tmp1 = split /:/, $host;
         my @tmp2 = split /:/, $val;
-        _log($dbh, (domain_id => $dom_id, group_id => $group,
+        $self->_log(domain_id => $dom_id, group_id => $group,
                 entry => "[new $domain] Added SOA record [contact $tmp1[0]] [master $tmp1[1]] ".
-                "[refresh $tmp2[0]] [retry $tmp2[1]] [expire $tmp2[2]] [minttl $tmp2[3]], TTL $ttl"));
+                "[refresh $tmp2[0]] [retry $tmp2[1]] [expire $tmp2[2]] [minttl $tmp2[3]], TTL $ttl");
       } else {
         my $logentry = "[new $domain] Added record '$host $typemap{$type}";
         $logentry .= " [distance $dist]" if $typemap{$type} eq 'MX';
         $logentry .= " [priority $dist] [weight $weight] [port $port]" if $typemap{$type} eq 'SRV';
-        _log($dbh, (domain_id => $dom_id, group_id => $group,
-                entry => $logentry." $val', TTL $ttl"));
+        $self->_log(domain_id => $dom_id, group_id => $group,
+                entry => $logentry." $val', TTL $ttl");
       }
     }
@@ -1825 +1876 @@
     my $msg = $@;
     eval { $dbh->rollback; };
-    _log($dbh, (group_id => $group, entry => "Failed adding domain $domain ($msg)"))
+    $self->_log(group_id => $group, entry => "Failed adding domain $domain ($msg)")
         if $config{log_failures};
     $dbh->commit;       # since we enabled transactions earlier
@@ -1841 +1892 @@
 # later we may want to archive it in some way instead (status code 2, for example?)
 sub delZone {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $zoneid = shift;
   my $revrec = shift;
@@ -1852 +1904 @@
   my $msg = '';
   my $failmsg = '';
-  my $zone = ($revrec eq 'n' ? domainName($dbh, $zoneid) : revName($dbh, $zoneid));
+  my $zone = ($revrec eq 'n' ? $self->domainName($zoneid) : $self->revName($zoneid));
 
   return ('FAIL', ($revrec eq 'n' ? 'Domain' : 'Reverse zone')." ID $zoneid doesn't exist") if !$zone;
@@ -1860 +1912 @@
   $loghash{domain_id} = $zoneid if $revrec eq 'n';
   $loghash{rdns_id} = $zoneid if $revrec eq 'y';
-  $loghash{group_id} = parentID($dbh,
-        (id => $zoneid, type => ($revrec eq 'n' ? 'domain' : 'revzone'), revrec => $revrec) );
+  $loghash{group_id} = $self->parentID(
+        id => $zoneid, type => ($revrec eq 'n' ? 'domain' : 'revzone'), revrec => $revrec);
 
   # Wrap all the SQL in a transaction
@@ -1894 +1946 @@
     $msg = "Deleted ".($revrec eq 'n' ? 'domain' : 'reverse zone')." $zone";
     $loghash{entry} = $msg;
-    _log($dbh, %loghash);
+    $self->_log(%loghash);
 
     # once we get here, we should have suceeded.
@@ -1905 +1957 @@
     $loghash{entry} = "Error deleting $zone: $msg ($failmsg)";
     if ($config{log_failures}) {
-      _log($dbh, %loghash);
+      $self->_log(%loghash);
       $dbh->commit;     # since we enabled transactions earlier
     }
@@ -1922 +1974 @@
 sub domainName {
   $errstr = '';
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $domid = shift;
   my ($domname) = $dbh->selectrow_array("SELECT domain FROM domains WHERE domain_id=?", undef, ($domid) );
@@ -1936 +1989 @@
 sub revName {
   $errstr = '';
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $revid = shift;
   my ($revname) = $dbh->selectrow_array("SELECT revnet FROM revzones WHERE rdns_id=?", undef, ($revid) );
@@ -1949 +2003 @@
 sub domainID {
   $errstr = '';
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $domain = shift;
   my ($domid) = $dbh->selectrow_array("SELECT domain_id FROM domains WHERE lower(domain) = lower(?)",
@@ -1963 +2018 @@
 sub revID {
   $errstr = '';
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $revzone = shift;
   my ($revid) = $dbh->selectrow_array("SELECT rdns_id FROM revzones WHERE revnet=?", undef, ($revzone) );
@@ -1977 +2033 @@
 # Returns a status code and message
 sub addRDNS {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $zone = NetAddr::IP->new(shift);
+
   return ('FAIL',"Zone name must be a valid CIDR netblock") unless ($zone && $zone->addr !~ /^0/);
   my $revpatt = shift;  # construct a custom (A/AAAA+)? PTR template record
   my $group = shift;
   my $state = shift;
+  my $defloc = shift || '';
 
   $state = 1 if $state =~ /^active$/;
@@ -2007 +2066 @@
   # Wrap all the SQL in a transaction
   eval {
-    # insert the domain...
-    $dbh->do("INSERT INTO revzones (revnet,group_id,status) VALUES (?,?,?)", undef, ($zone, $group, $state));
+    # insert the zone...
+    $dbh->do("INSERT INTO revzones (revnet,group_id,status,default_location) VALUES (?,?,?,?)", undef,
+        ($zone, $group, $state, $defloc) );
 
     # get the ID...
     ($rdns_id) = $dbh->selectrow_array("SELECT currval('revzones_rdns_id_seq')");
 
-    _log($dbh, (rdns_id => $rdns_id, group_id => $group,
-        entry => "Added ".($state ? 'active' : 'inactive')." reverse zone $zone"));
+    $self->_log(rdns_id => $rdns_id, group_id => $group,
+        entry => "Added ".($state ? 'active' : 'inactive')." reverse zone $zone");
 
     # ... and now we construct the standard records from the default set.  NB:  group should be variable.
     my $sth = $dbh->prepare("SELECT host,type,val,ttl FROM default_rev_records WHERE group_id=?");
-    my $sth_in = $dbh->prepare("INSERT INTO records (rdns_id,domain_id,host,type,val,ttl)".
-        " VALUES ($rdns_id,?,?,?,?,?)");
+    my $sth_in = $dbh->prepare("INSERT INTO records (rdns_id,domain_id,host,type,val,ttl,location)".
+        " VALUES ($rdns_id,?,?,?,?,?,?)");
     $sth->execute($group);
     while (my ($host,$type,$val,$ttl) = $sth->fetchrow_array()) {
@@ -2035 +2095 @@
       # While we're at it, we substitute $zone for ZONE in the value.
       if ($val eq 'ZONE') {
-        next if $revpatt;       # If we've got a pattern, we skip the default record version.
+        # If we've got a pattern, we skip the default record version on (A+)PTR-template types
+        next if $revpatt && ($type == 65282 || $type == 65283); 
 ##fixme?  do we care if we have multiple whole-zone templates?
         $val = $zone->network;
@@ -2049 +2110 @@
         }
         my $addr;
-        if (_ipparent($dbh, 'n', 'y', \$tmpval, $rdns_id, \$addr)) {
+        if ($self->_ipparent('n', 'y', \$tmpval, $rdns_id, \$addr)) {
           $val = $addr->addr;
         } else {
@@ -2065 +2126 @@
       my $domid = 0;
       if ($type >= 65280) {
-        if (!($domid = _hostparent($dbh, $host))) {
+        if (!($domid = $self->_hostparent($host))) {
           $warnstr .= "\nRecord added as PTR instead of $typemap{$type};  domain not found for $host";
           $type = $reverse_typemap{PTR};
@@ -2072 +2133 @@
       }
 
-      $sth_in->execute($domid,$host,$type,$val,$ttl);
+      $sth_in->execute($domid,$host,$type,$val,$ttl,$defloc);
 
       if ($typemap{$type} eq 'SOA') {
         my @tmp1 = split /:/, $host;
         my @tmp2 = split /:/, $val;
-        _log($dbh, (rdns_id => $rdns_id, group_id => $group,
+        $self->_log(rdns_id => $rdns_id, group_id => $group,
                 entry => "[new $zone] Added SOA record [contact $tmp1[0]] [master $tmp1[1]] ".
-                "[refresh $tmp2[0]] [retry $tmp2[1]] [expire $tmp2[2]] [minttl $tmp2[3]], TTL $ttl"));
+                "[refresh $tmp2[0]] [retry $tmp2[1]] [expire $tmp2[2]] [minttl $tmp2[3]], TTL $ttl");
         $defttl = $tmp2[3];
       } else {
-        my $logentry = "[new $zone] Added record '$host $typemap{$type}";
-        _log($dbh, (rdns_id => $rdns_id, domain_id => $domid, group_id => $group,
-                entry => $logentry." $val', TTL $ttl"));
+        my $logentry = "[new $zone] Added record '$host $typemap{$type} $val', TTL $ttl";
+        $logentry .= ", default location ".$self->getLoc($defloc)->{description} if $defloc;
+        $self->_log(rdns_id => $rdns_id, domain_id => $domid, group_id => $group, entry => $logentry);
       }
     }
@@ -2098 +2159 @@
 
       my $domid = 0;
-      if (!($domid = _hostparent($dbh, $host))) {
+      if (!($domid = $self->_hostparent($host))) {
         $warnstr .= "\nDefault pattern added as PTR template instead of $typemap{$type};  domain not found for $host";
         $type = 65282;
@@ -2104 +2165 @@
       }
 
-      $sth_in->execute($domid,$host,$type,$val,$defttl);
+      $sth_in->execute($domid,$host,$type,$val,$defttl,$defloc);
       my $logentry = "[new $zone] Added record '$host $typemap{$type}";
-      _log($dbh, (rdns_id => $rdns_id, domain_id => $domid, group_id => $group,
-        entry => $logentry." $val', TTL $defttl from pattern"));
+      $self->_log(rdns_id => $rdns_id, domain_id => $domid, group_id => $group,
+        entry => $logentry." $val', TTL $defttl from pattern");
     }
 
     # If there are warnings (presumably about default records skipped for cause) log them
-    _log($dbh, (rdns_id => $rdns_id, group_id => $group, entry => "Warning(s) adding $zone:$warnstr"))
+    $self->_log(rdns_id => $rdns_id, group_id => $group, entry => "Warning(s) adding $zone:$warnstr")
         if $warnstr;
 
@@ -2121 +2182 @@
     my $msg = $@;
     eval { $dbh->rollback; };
-    _log($dbh, (group_id => $group, entry => "Failed adding reverse zone $zone ($msg)"))
+    $self->_log(group_id => $group, entry => "Failed adding reverse zone $zone ($msg)")
         if $config{log_failures};
     $dbh->commit;       # since we enabled transactions earlier
@@ -2146 +2207 @@
 # Returns an integer count of the resulting zone list.
 sub getZoneCount {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
   my %args = @_;
@@ -2179 +2241 @@
 # Returns a reference to an array of hashrefs suitable for feeding to HTML::Template
 sub getZoneList {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
   my %args = @_;
@@ -2185 +2248 @@
   my @zonelist;
 
-  $args{sortorder} = 'ASC' if !grep /^$args{sortorder}$/, ('ASC','DESC');
+  $args{sortorder} = 'ASC' if !$args{sortorder} || !grep /^$args{sortorder}$/, ('ASC','DESC');
   $args{offset} = 0 if !$args{offset} || $args{offset} !~ /^(?:all|\d+)$/;
 
@@ -2197 +2260 @@
   # Not as compact, and fix-me-twice if the common bits get wrong, but much easier to read
   if ($args{revrec} eq 'n') {
-    $args{sortby} = 'domain' if !grep /^$args{sortby}$/, ('domain','group','status');
+    $args{sortby} = 'domain' if !$args{sortby} || !grep /^$args{sortby}$/, ('domain','group','status');
     $sql = "SELECT domain_id,domain,status,groups.group_name AS group FROM domains".
         " INNER JOIN groups ON domains.group_id=groups.group_id".
@@ -2205 +2268 @@
   } else {
 ##fixme:  arguably startwith here is irrelevant.  depends on the UI though.
-    $args{sortby} = 'revnet' if !grep /^$args{sortby}$/, ('revnet','group','status');
+    $args{sortby} = 'revnet' if !$args{sortby} || !grep /^$args{sortby}$/, ('revnet','group','status');
     $sql = "SELECT rdns_id,revnet,status,groups.group_name AS group FROM revzones".
         " INNER JOIN groups ON revzones.group_id=groups.group_id".
@@ -2237 +2300 @@
 # Takes a database handle, forward/reverse flag, and zone ID
 sub getZoneLocation {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $revrec = shift;
   my $zoneid = shift;
@@ -2255 +2319 @@
 sub addGroup {
   $errstr = '';
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $groupname = shift;
   my $pargroup = shift;
@@ -2330 +2395 @@
     }
 
-    _log($dbh, (group_id => $pargroup, entry => "Added group $groupname") );
+    $self->_log(group_id => $pargroup, entry => "Added group $groupname");
 
     # once we get here, we should have suceeded.
@@ -2340 +2405 @@
     eval { $dbh->rollback; };
     if ($config{log_failures}) {
-      _log($dbh, (group_id => $pargroup, entry => "Failed to add group $groupname: $msg") );
+      $self->_log(group_id => $pargroup, entry => "Failed to add group $groupname: $msg");
       $dbh->commit;
     }
@@ -2355 +2420 @@
 # Returns a status code and message
 sub delGroup {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $groupid = shift;
 
@@ -2371 +2437 @@
 
   # collect some pieces for logging and error messages
-  my $groupname = groupName($dbh,$groupid);
-  my $parid = parentID($dbh, (id => $groupid, type => 'group'));
+  my $groupname = $self->groupName($groupid);
+  my $parid = $self->parentID(id => $groupid, type => 'group');
 
   # Wrap all the SQL in a transaction
@@ -2392 +2458 @@
     $dbh->do("DELETE from groups WHERE group_id=?", undef, ($groupid));
 
-    _log($dbh, (group_id => $parid, entry => "Deleted group $groupname"));
+    $self->_log(group_id => $parid, entry => "Deleted group $groupname");
     $resultmsg = "Deleted group $groupname";
 
@@ -2403 +2469 @@
     eval { $dbh->rollback; };
     if ($config{log_failures}) {
-      _log($dbh, (group_id => $parid, entry => "$failmsg: $msg"));
+      $self->_log(group_id => $parid, entry => "$failmsg: $msg");
       $dbh->commit;     # since we enabled transactions earlier
     }
@@ -2421 +2487 @@
 sub getChildren {
   $errstr = '';
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $rootgroup = shift;
   my $groupdest = shift;
@@ -2442 +2509 @@
     while (my ($group) = $sth->fetchrow_array) {
       push @$groupdest, $group;
-      getChildren($dbh,$group,$groupdest) if $immed eq 'all';
+      $self->getChildren($group, $groupdest) if $immed eq 'all';
     }
   }
@@ -2454 +2521 @@
 sub groupName {
   $errstr = '';
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $groupid = shift;
   my $sth = $dbh->prepare("SELECT group_name FROM groups WHERE group_id=?");
@@ -2472 +2540 @@
 # Returns an integer count of the resulting group list.
 sub getGroupCount {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
   my %args = @_;
@@ -2497 +2566 @@
 # Returns an arrayref containing hashrefs suitable for feeding straight to HTML::Template
 sub getGroupList {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
   my %args = @_;
@@ -2557 +2627 @@
 sub groupID {
   $errstr = '';
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $group = shift;
   my ($grpid) = $dbh->selectrow_array("SELECT group_id FROM groups WHERE group_name=?", undef, ($group) );
@@ -2581 +2652 @@
 sub addUser {
   $errstr = '';
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $username = shift;
   my $group = shift;
@@ -2669 +2741 @@
 ##fixme: add another table to hold name/email for log table?
 
-    _log($dbh, (group_id => $group, entry => "Added user $username ($fname $lname)"));
+    $self->_log(group_id => $group, entry => "Added user $username ($fname $lname)");
     # once we get here, we should have suceeded.
     $dbh->commit;
@@ -2678 +2750 @@
     eval { $dbh->rollback; };
     if ($config{log_failures}) {
-      _log($dbh, (group_id => $group, entry => "Error adding user $username: $msg"));
+      $self->_log(group_id => $group, entry => "Error adding user $username: $msg");
       $dbh->commit;     # since we enabled transactions earlier
     }
@@ -2695 +2767 @@
 # - a "Starts with" string
 sub getUserCount {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
   my %args = @_;
@@ -2723 +2796 @@
 # - offset/return-all-everything flag (defaults to $perpage records)
 sub getUserList {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
   my %args = @_;
@@ -2763 +2837 @@
 # Returns a reference to a list of hashrefs suitable to feeding to HTML::Template
 sub getUserDropdown {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $grp = shift;
   my $sel = shift || 0;
@@ -2783 +2858 @@
 
 
-## DNSDB::checkUser()
-# Check user/pass combo on login
-sub checkUser {
-  my $dbh = shift;
-  my $user = shift;
-  my $inpass = shift;
-
-  my $sth = $dbh->prepare("SELECT user_id,group_id,password,firstname,lastname FROM users WHERE username=?");
-  $sth->execute($user);
-  my ($uid,$gid,$pass,$fname,$lname) = $sth->fetchrow_array;
-  my $loginfailed = 1 if !defined($uid);
-
-  if ($pass =~ m|^\$1\$([A-Za-z0-9/.]+)\$|) {
-    $loginfailed = 1 if $pass ne unix_md5_crypt($inpass,$1);
-  } else {
-    $loginfailed = 1 if $pass ne $inpass;
-  }
-
-  # nnnngggg
-  return ($uid, $gid);
-} # end checkUser
-
-
 ## DNSDB:: updateUser()
 # Update general data about user
 sub updateUser {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
 ##fixme:  tweak calling convention so that we can update any given bit of data
@@ -2849 +2902 @@
         " WHERE user_id=?", undef, ($username, $pass, $fname, $lname, $phone, $type, $state, $uid));
     $resultmsg = "Updated user info for $username ($fname $lname)";
-    _log($dbh, group_id => $group, entry => $resultmsg);
+    $self->_log(group_id => $group, entry => $resultmsg);
     $dbh->commit;
   };
@@ -2856 +2909 @@
     eval { $dbh->rollback; };
     if ($config{log_failures}) {
-      _log($dbh, (group_id => $group, entry => "Error updating user $username: $msg"));
+      $self->_log(group_id => $group, entry => "Error updating user $username: $msg");
       $dbh->commit;     # since we enabled transactions earlier
     }
@@ -2871 +2924 @@
 # Returns a success/failure code and matching message
 sub delUser {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $userid = shift;
 
   return ('FAIL',"Bad userid") if !defined($userid);
 
-  my $userdata = getUserData($dbh, $userid);
+  my $userdata = $self->getUserData($userid);
 
   # Allow transactions, and raise an exception on errors so we can catch it later.
@@ -2885 +2939 @@
   eval {
     $dbh->do("DELETE FROM users WHERE user_id=?", undef, ($userid));
-    _log($dbh, (group_id => $userdata->{group_id},
+    $self->_log(group_id => $userdata->{group_id},
         entry => "Deleted user ID $userid/".$userdata->{username}.
-                " (".$userdata->{firstname}." ".$userdata->{lastname}.")") );
+                " (".$userdata->{firstname}." ".$userdata->{lastname}.")");
     $dbh->commit;
   };
@@ -2894 +2948 @@
     eval { $dbh->rollback; };
     if ($config{log_failures}) {
-      _log($dbh, (group_id => $userdata->{group_id}, entry => "Error deleting user ID ".
-        "$userid/".$userdata->{username}.": $msg") );
+      $self->_log(group_id => $userdata->{group_id}, entry => "Error deleting user ID ".
+        "$userid/".$userdata->{username}.": $msg");
       $dbh->commit;
     }
@@ -2915 +2969 @@
 sub userFullName {
   $errstr = '';
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $userid = shift;
   my $fullformat = shift || '%f %l (%u)';
@@ -2936 +2991 @@
 # Returns undef on errors.
 sub userStatus {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $id = shift;
   my $newstatus = shift || 'mu';
@@ -2942 +2998 @@
   return undef if $id !~ /^\d+$/;
 
-  my $userdata = getUserData($dbh, $id);
+  my $userdata = $self->getUserData($id);
 
   # Allow transactions, and raise an exception on errors so we can catch it later.
@@ -2960 +3016 @@
 
       my %loghash;
-      $loghash{group_id} = parentID($dbh, (id => $id, type => 'user'));
+      $loghash{group_id} = $self->parentID(id => $id, type => 'user');
       $loghash{entry} = $resultstr;
-      _log($dbh, %loghash);
+      $self->_log(%loghash);
 
       $dbh->commit;
@@ -2984 +3040 @@
 # Get misc user data for display
 sub getUserData {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $uid = shift;
 
@@ -3000 +3057 @@
 # Returns ('OK',<location>) on success, ('FAIL',<failmsg>) on failure
 sub addLoc {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $grp = shift;
   my $shdesc = shift;
@@ -3038 +3096 @@
     # Get the "last" location.  Note this is the only use for loc_id, because selecting on location Does Funky Things
     ($loc) = $dbh->selectrow_array("SELECT location FROM locations ORDER BY loc_id DESC LIMIT 1");
-    ($loc) = ($loc =~ /^(..)/);
+    ($loc) = ($loc =~ /^(..)/) if $loc;
     my $origloc = $loc;
+    $loc = 'aa' if !$loc;       
     # Make a change...
     $loc++;
@@ -3055 +3114 @@
     $dbh->do("INSERT INTO locations (location, group_id, iplist, description, comments) VALUES (?,?,?,?,?)", 
         undef, ($loc, $grp, $iplist, $shdesc, $comments) );
-    _log($dbh, entry => "Added location ($shdesc, '$iplist')");
+    $self->_log(entry => "Added location ($shdesc, '$iplist')");
     $dbh->commit;
   };
@@ -3063 +3122 @@
     if ($config{log_failures}) {
       $shdesc = $loc if !$shdesc;
-      _log($dbh, (entry => "Failed adding location ($shdesc, '$iplist'): $msg"));
+      $self->_log(entry => "Failed adding location ($shdesc, '$iplist'): $msg");
       $dbh->commit;
     }
@@ -3079 +3138 @@
 # Returns a result code and message
 sub updateLoc {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $loc = shift;
   my $grp = shift;
@@ -3095 +3155 @@
   local $dbh->{RaiseError} = 1;
 
-  my $oldloc = getLoc($dbh, $loc);
+  my $oldloc = $self->getLoc($loc);
   my $okmsg = "Updated location (".$oldloc->{description}.", '".$oldloc->{iplist}."') to ($shdesc, '$iplist')";
 
@@ -3101 +3161 @@
     $dbh->do("UPDATE locations SET group_id=?,iplist=?,description=?,comments=? WHERE location=?",
         undef, ($grp, $iplist, $shdesc, $comments, $loc) );
-    _log($dbh, entry => $okmsg);
+    $self->_log(entry => $okmsg);
     $dbh->commit;
   };
@@ -3109 +3169 @@
     if ($config{log_failures}) {
       $shdesc = $loc if !$shdesc;
-      _log($dbh, (entry => "Failed updating location ($shdesc, '$iplist'): $msg"));
+      $self->_log(entry => "Failed updating location ($shdesc, '$iplist'): $msg");
       $dbh->commit;
     }
@@ -3121 +3181 @@
 ## DNSDB::delLoc()
 sub delLoc {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $loc = shift;
 
@@ -3129 +3190 @@
   local $dbh->{RaiseError} = 1;
 
-  my $oldloc = getLoc($dbh, $loc);
+  my $oldloc = $self->getLoc($loc);
   my $olddesc = ($oldloc->{description} ? $oldloc->{description} : $loc);
   my $okmsg = "Deleted location ($olddesc, '".$oldloc->{iplist}."')";
@@ -3139 +3200 @@
     die "Records still exist in location $olddesc\n" if $r;
     $dbh->do("DELETE FROM locations WHERE location=?", undef, ($loc) );
-    _log($dbh, entry => $okmsg);
+    $self->_log(entry => $okmsg);
     $dbh->commit;
   };
@@ -3146 +3207 @@
     eval { $dbh->rollback; };
     if ($config{log_failures}) {
-      _log($dbh, (entry => "Failed to delete location ($olddesc, '$oldloc->{iplist}'): $msg"));
+      $self->_log(entry => "Failed to delete location ($olddesc, '$oldloc->{iplist}'): $msg");
       $dbh->commit;
     }
@@ -3161 +3222 @@
 # Returns a reference to a hash containing the group ID, IP list, description, and comments/notes
 sub getLoc {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $loc = shift;
 
@@ -3177 +3239 @@
 # - a "Starts with" string
 sub getLocCount {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
   my %args = @_;
@@ -3200 +3263 @@
 ## DNSDB::getLocList()
 sub getLocList {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
   my %args = @_;
@@ -3239 +3303 @@
 # Returns a reference to a list of hashrefs suitable to feeding to HTML::Template
 sub getLocDropdown {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $grp = shift;
   my $sel = shift || '';
@@ -3251 +3316 @@
 
   my @loclist;
-  push @loclist, { locname => "(None/public)", loc => '', selected => ($sel ? 0 : ($sel eq '' ? 1 : 0)) };
+  push @loclist, { locname => "(Default/All)", loc => '', selected => ($sel ? 0 : ($sel eq '' ? 1 : 0)) };
   while (my ($locname, $loc) = $sth->fetchrow_array) {
     my %row = (
@@ -3269 +3334 @@
 sub getSOA {
   $errstr = '';
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $def = shift;
   my $rev = shift;
@@ -3297 +3363 @@
 # Returns a two-element list with a result code and message
 sub updateSOA {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $defrec = shift;
   my $revrec = shift;
@@ -3303 +3370 @@
   my %soa = @_;
 
-  my $oldsoa = getSOA($dbh, $defrec, $revrec, $soa{id});
+  my $oldsoa = $self->getSOA($defrec, $revrec, $soa{id});
 
   my $msg;
@@ -3310 +3377 @@
     $logdata{domain_id} = $soa{id} if $revrec eq 'n';
     $logdata{rdns_id} = $soa{id} if $revrec eq 'y';
-    $logdata{group_id} = parentID($dbh, (id => $soa{id}, revrec => $revrec,
-        type => ($revrec eq 'n' ? 'domain' : 'revzone') ) );
+    $logdata{group_id} = $self->parentID(id => $soa{id}, revrec => $revrec,
+        type => ($revrec eq 'n' ? 'domain' : 'revzone') );
   } else {
     $logdata{group_id} = $soa{id};
   }
-  my $parname = ($defrec eq 'y' ? groupName($dbh, $soa{id}) :
-                ($revrec eq 'n' ? domainName($dbh, $soa{id}) : revName($dbh, $soa{id})) );
+  my $parname = ($defrec eq 'y' ? $self->groupName($soa{id}) :
+                ($revrec eq 'n' ? $self->domainName($soa{id}) : $self->revName($soa{id})) );
 
   # Allow transactions, and raise an exception on errors so we can catch it later.
@@ -3335 +3402 @@
 
     $logdata{entry} = $msg;
-    _log($dbh, %logdata);
+    $self->_log(%logdata);
 
     $dbh->commit;
@@ -3345 +3412 @@
         "SOA record for $parname: $msg";
     if ($config{log_failures}) {
-      _log($dbh, %logdata);
+      $self->_log(%logdata);
       $dbh->commit;
     }
@@ -3360 +3427 @@
 sub getRecLine {
   $errstr = '';
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $defrec = shift;
   my $revrec = shift;
@@ -3390 +3458 @@
     $ret->{secid} = (($revrec eq 'y') ? $ret->{domain_id} : $ret->{rdns_id}) if $ret->{type} > 65279;
   }
+  $ret->{address} = $ret->{val};        # because.
 
   return $ret;
@@ -3403 +3472 @@
 sub getDomRecs {
   $errstr = '';
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
   my %args = @_;
@@ -3462 +3532 @@
 # Returns the count
 sub getRecCount {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $defrec = shift;
   my $revrec = shift;
@@ -3496 +3567 @@
 sub addRec {
   $errstr = '';
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $defrec = shift;
   my $revrec = shift;
@@ -3554 +3626 @@
 
   # Call the validation sub for the type requested.
-  ($retcode,$retmsg) = $validators{$$rectype}($dbh, (defrec => $defrec, revrec => $revrec, id => $id,
+  ($retcode,$retmsg) = $validators{$$rectype}($self, defrec => $defrec, revrec => $revrec, id => $id,
         host => $host, rectype => $rectype, val => $val, addr => $addr,
         dist => \$dist, port => \$port, weight => \$weight,
-        fields => \$fields, vallist => \@vallist) );
+        fields => \$fields, vallist => \@vallist);
 
   return ($retcode,$retmsg) if $retcode eq 'FAIL';
 
   # Set up database fields and bind parameters
-  $fields .= "host,type,val,ttl,location,"._recparent($defrec,$revrec);
-  push @vallist, ($$host,$$rectype,$$val,$ttl,$location,$id);
+  $fields .= "host,type,val,ttl,"._recparent($defrec,$revrec);
+  push @vallist, ($$host,$$rectype,$$val,$ttl,$id);
+
+  # locations are not for default records, silly coder!
+  if ($defrec eq 'n') {
+    $fields .= ",location";
+    push @vallist, $location;
+  }
   my $vallen = '?'.(',?'x$#vallist);
 
@@ -3576 +3654 @@
   }
   $logdata{group_id} = $id if $defrec eq 'y';
-  $logdata{group_id} = parentID($dbh,
-                (id => $id, type => ($revrec eq 'n' ? 'domain' : 'revzone'), revrec => $revrec) )
+  $logdata{group_id} = $self->parentID(id => $id, type => ($revrec eq 'n' ? 'domain' : 'revzone'), revrec => $revrec)
         if $defrec eq 'n';
   $logdata{entry} = "Added ".($defrec eq 'y' ? 'default record' : 'record');
@@ -3591 +3668 @@
         if $typemap{$$rectype} eq 'SRV';
   $logdata{entry} .= "', TTL $ttl";
-  $logdata{entry} .= ", location ".getLoc($dbh, $location)->{description} if $location;
+  $logdata{entry} .= ", location ".$self->getLoc($location)->{description} if $location;
 
   # Allow transactions, and raise an exception on errors so we can catch it later.
@@ -3601 +3678 @@
     $dbh->do("INSERT INTO "._rectable($defrec, $revrec)." ($fields) VALUES ($vallen)",
         undef, @vallist);
-    _log($dbh, %logdata);
+    $self->_log(%logdata);
     $dbh->commit;
   };
@@ -3610 +3687 @@
       $logdata{entry} = "Failed adding ".($defrec eq 'y' ? 'default ' : '').
         "record '$$host $typemap{$$rectype} $$val', TTL $ttl ($msg)";
-      _log($dbh, %logdata);
+      $self->_log(%logdata);
       $dbh->commit;
     }
@@ -3629 +3706 @@
   $errstr = '';
 
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $defrec = shift;
   my $revrec = shift;
@@ -3683 +3761 @@
   # get old record data so we have the right parent ID
   # and for logging (eventually)
-  my $oldrec = getRecLine($dbh, $defrec, $revrec, $id);
+  my $oldrec = $self->getRecLine($defrec, $revrec, $id);
 
   # Call the validation sub for the type requested.
   # Note the ID to pass here is the *parent*, not the record
-  ($retcode,$retmsg) = $validators{$$rectype}($dbh, (defrec => $defrec, revrec => $revrec,
+  ($retcode,$retmsg) = $validators{$$rectype}($self, defrec => $defrec, revrec => $revrec,
         id => ($defrec eq 'y' ? $oldrec->{group_id} : ($revrec eq 'n' ? $oldrec->{domain_id} : $oldrec->{rdns_id})),
         host => $host, rectype => $rectype, val => $val, addr => $addr,
         dist => \$dist, port => \$port, weight => \$weight,
         fields => \$fields, vallist => \@vallist,
-        update => $id) );
+        update => $id);
 
   return ($retcode,$retmsg) if $retcode eq 'FAIL';
@@ -3698 +3776 @@
   # Set up database fields and bind parameters.  Note only the optional fields
   # (distance, weight, port, secondary parent ID) are added in the validation call above
-  $fields .= "host,type,val,ttl,location,"._recparent($defrec,$revrec);
-  push @vallist, ($$host,$$rectype,$$val,$ttl,$location,
+  $fields .= "host,type,val,ttl,"._recparent($defrec,$revrec);
+  push @vallist, ($$host,$$rectype,$$val,$ttl,
         ($defrec eq 'y' ? $oldrec->{group_id} : ($revrec eq 'n' ? $oldrec->{domain_id} : $oldrec->{rdns_id})) );
+
+  # locations are not for default records, silly coder!
+  if ($defrec eq 'n') {
+    $fields .= ",location";
+    push @vallist, $location;
+  }
 
   # hack hack PTHUI
@@ -3739 +3823 @@
   }
   $logdata{group_id} = $parid if $defrec eq 'y';
-  $logdata{group_id} = parentID($dbh,
-                (id => $parid, type => ($revrec eq 'n' ? 'domain' : 'revzone'), revrec => $revrec) )
+  $logdata{group_id} = $self->parentID(id => $parid, type => ($revrec eq 'n' ? 'domain' : 'revzone'), revrec => $revrec)
         if $defrec eq 'n';
   $logdata{entry} = "Updated ".($defrec eq 'y' ? 'default record' : 'record')." from\n";
@@ -3753 +3836 @@
         if $typemap{$oldrec->{type}} eq 'SRV';
   $logdata{entry} .= "', TTL $oldrec->{ttl}";
-  $logdata{entry} .= ", location ".getLoc($dbh, $oldrec->{location})->{description} if $oldrec->{location};
+  $logdata{entry} .= ", location ".$self->getLoc($oldrec->{location})->{description} if $oldrec->{location};
   $logdata{entry} .= "\nto\n";
   # More NS special
@@ -3764 +3847 @@
   $logdata{entry} .= " [priority $dist] [weight $weight] [port $port]" if $typemap{$$rectype} eq 'SRV';
   $logdata{entry} .= "', TTL $ttl";
-  $logdata{entry} .= ", location ".getLoc($dbh, $location)->{description} if $location;
+  $logdata{entry} .= ", location ".$self->getLoc($location)->{description} if $location;
 
   local $dbh->{AutoCommit} = 0;
@@ -3775 +3858 @@
   eval {
     $dbh->do("UPDATE "._rectable($defrec,$revrec)." SET $fields WHERE record_id=?", undef, (@vallist, $id) );
-    _log($dbh, %logdata);
+    $self->_log(%logdata);
     $dbh->commit;
   };
@@ -3784 +3867 @@
       $logdata{entry} = "Failed updating ".($defrec eq 'y' ? 'default ' : '').
         "record '$oldrec->{host} $typemap{$oldrec->{type}} $oldrec->{val}', TTL $oldrec->{ttl} ($msg)";
-      _log($dbh, %logdata);
+      $self->_log(%logdata);
       $dbh->commit;
     }
@@ -3793 +3876 @@
   return ($retcode, $retmsg);
 } # end updateRec()
+
+
+## DNSDB::downconvert()
+# A mostly internal (not exported) semiutilty sub to downconvert from pseudotype <x>
+# to a compatible component type.  Only a handful of operations are valid, anything
+# else is a null-op.
+# Takes the record ID and the new type.  Returns boolean.
+sub downconvert {
+  my $self = shift;
+  my $dbh = $self->{dbh};
+  my $recid = shift;
+  my $newtype = shift;
+
+  # also, only work on live records;  little to no value trying to do this on default records.
+  my $rec = $self->getRecLine('n', 'y', $recid);
+
+  # hm?
+  #return 1 if !$rec;
+
+  return 1 if $rec->{type} < 65000;     # Only the reverse-record pseudotypes can be downconverted
+  return 1 if $rec->{type} == 65282;    # Nowhere to go
+
+  my $delpar;
+  my @sqlargs;
+  if ($rec->{type} == 65280) {
+    return 1 if $newtype != 1 && $newtype != 12;
+    $delpar = ($newtype == 1 ? 'rdns_id' : 'domain_id');
+    push @sqlargs, 0, $newtype, $recid;
+  } elsif ($rec->{type} == 65281) {
+    return 1 if $newtype != 28 && $newtype != 12;
+    $delpar = ($newtype == 28 ? 'rdns_id' : 'domain_id');
+    push @sqlargs, 0, $newtype, $recid;
+  } elsif ($rec->{type} == 65283) {
+    return 1 if $newtype != 65282;
+    $delpar = 'rdns_id';
+  } elsif ($rec->{type} == 65284) {
+    return 1 if $newtype != 65282;
+    $delpar = 'rdns_id';
+  } else {
+    # Your llama is on fire.
+  }
+
+  local $dbh->{AutoCommit} = 0;
+  local $dbh->{RaiseError} = 1;
+
+  eval {
+    $dbh->do("UPDATE records SET $delpar = ?, type = ? WHERE record_id = ?", undef, @sqlargs);
+    $dbh->commit;
+  };
+  if ($@) {
+    $errstr = $@;
+    eval { $dbh->rollback; };
+    return 0;
+  }
+  return 1;
+} # end downconvert()
 
 
@@ -3799 +3938 @@
 sub delRec {
   $errstr = '';
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $defrec = shift;
   my $revrec = shift;
   my $id = shift;
 
-  my $oldrec = getRecLine($dbh, $defrec, $revrec, $id);
+  my $oldrec = $self->getRecLine($defrec, $revrec, $id);
 
   # Allow transactions, and raise an exception on errors so we can catch it later.
@@ -3816 +3956 @@
   $logdata{rdns_id} = $oldrec->{rdns_id};
   $logdata{group_id} = $oldrec->{group_id} if $defrec eq 'y';
-  $logdata{group_id} = parentID($dbh,
-                (id => $oldrec->{domain_id}, type => ($revrec eq 'n' ? 'domain' : 'revzone'), revrec => $revrec) )
+  $logdata{group_id} = $self->parentID(id => $oldrec->{domain_id}, type => ($revrec eq 'n' ? 'domain' : 'revzone'),
+        revrec => $revrec)
         if $defrec eq 'n';
   $logdata{entry} = "Deleted ".($defrec eq 'y' ? 'default record ' : 'record ').
@@ -3825 +3965 @@
         if $typemap{$oldrec->{type}} eq 'SRV';
   $logdata{entry} .= "', TTL $oldrec->{ttl}";
-  $logdata{entry} .= ", location ".getLoc($dbh, $oldrec->{location})->{description} if $oldrec->{location};
+  $logdata{entry} .= ", location ".$self->getLoc($oldrec->{location})->{description} if $oldrec->{location};
 
   eval {
     my $sth = $dbh->do("DELETE FROM "._rectable($defrec,$revrec)." WHERE record_id=?", undef, ($id));
-    _log($dbh, %logdata);
+    $self->_log(%logdata);
     $dbh->commit;
   };
@@ -3838 +3978 @@
       $logdata{entry} = "Error deleting ".($defrec eq 'y' ? 'default record' : 'record').
         " '$oldrec->{host} $typemap{$oldrec->{type}} $oldrec->{val}', TTL $oldrec->{ttl} ($msg)";
-      _log($dbh, %logdata);
+      $self->_log(%logdata);
       $dbh->commit;
     }
@@ -3853 +3993 @@
 # - Entity ID and entity type as the primary log "slice"
 sub getLogCount {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
   my %args = @_;
@@ -3889 +4030 @@
 # - offset for pagination
 sub getLogEntries {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
   my %args = @_;
@@ -3925 +4067 @@
 
 
+## IPDB::getRevPattern()
+# Get the narrowest template pattern applicable to a passed CIDR address (may be a netblock or an IP)
+sub getRevPattern {
+  my $self = shift;
+  my $dbh = $self->{dbh};
+  my $cidr = shift;
+  my $group = shift || 1;       # just in case
+
+  # for speed!  Casting and comparing even ~7K records takes ~2.5s, so narrow it down to one revzone first.
+  my ($revid) = $dbh->selectrow_array("SELECT rdns_id FROM revzones WHERE revnet >>= ? AND group_id = ?",
+        undef, ($cidr, $group) );
+
+##fixme?  may need to narrow things down more by octet-chopping and doing text comparisons before casting.
+  my ($revpatt) = $dbh->selectrow_array("SELECT host FROM records ".
+        "WHERE (type in (12,65280,65281,65282,65283,65284)) AND rdns_id = ? AND CAST (val AS inet) >>= ? ".
+        "ORDER BY CAST (val AS inet) DESC LIMIT 1", undef, ($revid, $cidr) );
+  return $revpatt;
+} # end getRevPattern()
+
+
 ## DNSDB::getTypelist()
 # Get a list of record types for various UI dropdowns
@@ -3930 +4092 @@
 # 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};
@@ -3977 +4140 @@
 # Returns the ID or undef on failure
 sub parentID {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
 
   my %args = @_;
@@ -4019 +4183 @@
 # Returns true if $id1 is a parent of $id2, false otherwise
 sub isParent {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $id1 = shift;
   my $type1 = shift; 
@@ -4063 +4228 @@
     return 1 if $type1 eq 'revzone' && $id1 == $rdns;
     # if request is group, check *both* parents.  Only check if the parent is nonzero though.
-    return 1 if $dom && isParent($dbh, $id1, $type1, $dom, 'domain');
-    return 1 if $rdns && isParent($dbh, $id1, $type1, $rdns, 'revzone');
+    return 1 if $dom && $self->isParent($id1, $type1, $dom, 'domain');
+    return 1 if $rdns && $self->isParent($id1, $type1, $rdns, 'revzone');
     # exit here since we've executed the loop below by proxy in the above recursive calls.
     return 0;
@@ -4104 +4269 @@
 # Returns status, or undef on errors.
 sub zoneStatus {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $id = shift;
   my $revrec = shift;
@@ -4125 +4291 @@
 
 ##fixme  switch to more consise "Enabled <domain"/"Disabled <domain>" as with users?
-      $resultstr = "Changed ".($revrec eq 'n' ? domainName($dbh, $id) : revName($dbh, $id)).
+      $resultstr = "Changed ".($revrec eq 'n' ? $self->domainName($id) : $self->revName($id)).
         " state to ".($newstatus ? 'active' : 'inactive');
 
@@ -4131 +4297 @@
       $loghash{domain_id} = $id if $revrec eq 'n';
       $loghash{rdns_id} = $id if $revrec eq 'y';
-      $loghash{group_id} = parentID($dbh,
-        (id => $id, type => ($revrec eq 'n' ? 'domain' : 'revzone'), revrec => $revrec) );
+      $loghash{group_id} = $self->parentID(id => $id, type => ($revrec eq 'n' ? 'domain' : 'revzone'), revrec => $revrec);
       $loghash{entry} = $resultstr;
-      _log($dbh, %loghash);
+      $self->_log(%loghash);
 
       $dbh->commit;
@@ -4154 +4319 @@
 
 
+## DNSDB::getZonesByCIDR()
+# Get a list of zone names and IDs that records for a passed CIDR block are within.
+sub getZonesByCIDR {
+  my $self = shift;
+  my $dbh = $self->{dbh};
+  my %args = @_;
+
+  my $result = $dbh->selectall_arrayref("SELECT rdns_id,revnet FROM revzones WHERE revnet >>= ? OR revnet <<= ?",
+        { Slice => {} }, ($args{cidr}, $args{cidr}) );
+  return $result;
+} # end getZonesByCIDR()
+
+
 ## DNSDB::importAXFR
 # Import a domain via AXFR
 # Takes AXFR host, domain to transfer, group to put the domain in,
-# and optionally:
-#  - active/inactive state flag (defaults to active)
-#  - overwrite-SOA flag (defaults to off)
-#  - overwrite-NS flag (defaults to off, doesn't affect subdomain NS records)
+# and an optional hash containing:
+#  status - active/inactive state flag (defaults to active)
+#  rwsoa - overwrite-SOA flag (defaults to off)
+#  rwns - overwrite-NS flag (defaults to off, doesn't affect subdomain NS records)
+#  merge - flag to automerge A or AAAA records with matching PTR records
 # Returns a status code (OK, WARN, or FAIL) and message - message should be blank
 # if status is OK, but WARN includes conditions that are not fatal but should
 # really be reported.
 sub importAXFR {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $ifrom_in = shift;
   my $zone = shift;
   my $group = shift;
-  my $status = shift;
-  $status = (defined($status) ? $status : 0);   # force sane semantics, and allow passing "null" (inactive) status
-  my $rwsoa = shift || 0;
-  my $rwns = shift || 0;
-  my $newttl = shift;
-
-  my $merge = shift || 0;       # do we attempt to merge A/AAAA and PTR records whenever possible?
-                                # do we overload this with the fixme below?
+
+  my %args = @_;
+
 ##fixme:  add mode to delete&replace, merge+overwrite, merge new?
+
+  $args{status} = (defined($args{status}) ? $args{status} : 0);
+  $args{status} = 1 if $args{status} eq 'on'; 
 
   my $nrecs = 0;
@@ -4283 +4461 @@
     if ($rev eq 'n') {
 ##fixme:  serial
-      $dbh->do("INSERT INTO domains (domain,group_id,status) VALUES (?,?,?)", undef, ($zone,$group,$status) );
+      $dbh->do("INSERT INTO domains (domain,group_id,status) VALUES (?,?,?)", undef,
+        ($zone, $group, $args{status}) );
       # get domain id so we can do the records
       ($zone_id) = $dbh->selectrow_array("SELECT currval('domains_domain_id_seq')");
       $domain_id = $zone_id;
-      _log($dbh, (group_id => $group, domain_id => $domain_id,
-                entry => "[Added ".($status ? 'active' : 'inactive')." domain $zone via AXFR]") );
+      $self->_log(group_id => $group, domain_id => $domain_id,
+                entry => "[Added ".($args{status} ? 'active' : 'inactive')." domain $zone via AXFR]");
     } else {
 ##fixme:  serial
-      $dbh->do("INSERT INTO revzones (revnet,group_id,status) VALUES (?,?,?)", undef, ($cidr,$group,$status) );
+      $dbh->do("INSERT INTO revzones (revnet,group_id,status) VALUES (?,?,?)", undef,
+        ($cidr,$group,$args{status}) );
       # get revzone id so we can do the records
       ($zone_id) = $dbh->selectrow_array("SELECT currval('revzones_rdns_id_seq')");
       $rdns_id = $zone_id;
-      _log($dbh, (group_id => $group, rdns_id => $rdns_id,
-                entry => "[Added ".($status ? 'active' : 'inactive')." reverse zone $cidr via AXFR]") );
+      $self->_log(group_id => $group, rdns_id => $rdns_id,
+                entry => "[Added ".($args{status} ? 'active' : 'inactive')." reverse zone $cidr via AXFR]");
     }
 
@@ -4331 +4511 @@
       my $ttl = ($newttl ? $newttl : $rr->ttl); # allow force-override TTLs
       my $host = $rr->name;
+      my $ttl = ($args{newttl} ? $args{newttl} : $rr->ttl);     # allow force-override TTLs
 
       $soaflag = 1 if $type eq 'SOA';
@@ -4360 +4541 @@
       } elsif ($type eq 'NS') {
 # hmm.  should we warn here if subdomain NS'es are left alone?
-        next if ($rwns && ($rr->name eq $zone));
+        next if ($args{rwns} && ($rr->name eq $zone));
         if ($rev eq 'y') {
           # revzones have records more or less reversed from forward zones.
@@ -4396 +4577 @@
         }
       } elsif ($type eq 'SOA') {
-        next if $rwsoa;
+        next if $args{rwsoa};
         $host = $rr->rname.":".$rr->mname;
         $val = $rr->refresh.":".$rr->retry.":".$rr->expire.":".$rr->minimum;
@@ -4444 +4625 @@
       my $logentry = "[AXFR ".($rev eq 'n' ? $zone : $cidr)."] ";
 
-      if ($merge) {
+      if ($args{merge}) {
         if ($rev eq 'n') {
           # importing a domain;  we have A and AAAA records that could be merged with matching PTR records
@@ -4464 +4645 @@
                 ($domain_id, $ettl, $etype, $erid));
             $nrecs++;
-            _log($dbh, (group_id => $group, domain_id => $domain_id, rdns_id => $erdns, entry => $logentry) );
+            $self->_log(group_id => $group, domain_id => $domain_id, rdns_id => $erdns, entry => $logentry);
             next;       # while axfr_next
           }
@@ -4486 +4667 @@
                 ($rdns_id, $ettl, $etype, $erid));
             $nrecs++;
-            _log($dbh, (group_id => $group, domain_id => $domid, rdns_id => $rdns_id, entry => $logentry) );
+            $self->_log(group_id => $group, domain_id => $domid, rdns_id => $rdns_id, entry => $logentry);
             next;       # while axfr_next
           }
         } # $rev eq 'y'
-      } # if $merge
+      } # if $args{merge}
 
       # Insert the new record
@@ -4499 +4680 @@
 
       if ($type eq 'SOA') {
-        # also !$rwsoa, but if that's set, it should be impossible to get here.
+        # also !$args{rwsoa}, but if that's set, it should be impossible to get here.
         my @tmp1 = split /:/, $host;
         my @tmp2 = split /:/, $val;
@@ -4513 +4694 @@
         $logentry .= " $val', TTL $ttl";
       }
-      _log($dbh, (group_id => $group, domain_id => $domain_id, rdns_id => $rdns_id, entry => $logentry) );
+      $self->_log(group_id => $group, domain_id => $domain_id, rdns_id => $rdns_id, entry => $logentry);
 
     } # while axfr_next
@@ -4525 +4706 @@
 
     # Overwrite SOA record
-    if ($rwsoa) {
+    if ($args{rwsoa}) {
       $soaflag = 1;
       my $sthgetsoa = $dbh->prepare("SELECT host,val,ttl FROM default_records WHERE group_id=? AND type=?");
@@ -4538 +4719 @@
 
     # Overwrite NS records
-    if ($rwns) {
+    if ($args{rwns}) {
       $nsflag = 1;
       my $sthgetns = $dbh->prepare("SELECT host,val,ttl FROM default_records WHERE group_id=? AND type=?");
@@ -4584 +4765 @@
 ## DNSDB::export()
 # Export the DNS database, or a part of it
-# Takes database handle, export type, optional arguments depending on type
+# Takes a string indicating the export type, plus optional arguments depending on type
 # Writes zone data to targets as appropriate for type
 sub export {
-  my $dbh = shift;
+  my $self = shift;
   my $target = shift;
 
   if ($target eq 'tiny') {
-    __export_tiny($dbh,@_);
+    $self->__export_tiny(@_);
   }
 # elsif ($target eq 'foo') {
-#   __export_foo($dbh,@_);
+#   __export_foo(@_);
 #}
 # etc
@@ -4603 +4784 @@
 ## DNSDB::__export_tiny
 # Internal sub to implement tinyDNS (compatible) export
-# Takes database handle, filehandle to write export to, optional argument(s)
+# Takes filehandle to write export to, optional argument(s)
 # to determine which data gets exported
 sub __export_tiny {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $datafile = shift;
 
@@ -4625 +4807 @@
     foreach my $ipprefix (split /[,\s]+/, $lochash->{$location}{iplist}) {
       $ipprefix =~ s/\s+//g;
-      print $datafile "%$location:$ipprefix\n";
+      $ipprefix = new NetAddr::IP $ipprefix;
+##fixme:  how to handle IPv6?
+next if $ipprefix->{isv6};
+      # have to account for /nn CIDR entries.  tinydns only speaks octet-sliced prefix.
+      if ($ipprefix->masklen <= 8) {
+        foreach ($ipprefix->split(8)) {
+          my $tmp = $_->addr;
+          $tmp =~ s/\.\d+\.\d+\.\d+$//;
+          print $datafile "%$location:$tmp\n";
+        }
+      } elsif ($ipprefix->masklen <= 16) {
+        foreach ($ipprefix->split(16)) {
+          my $tmp = $_->addr;
+          $tmp =~ s/\.\d+\.\d+$//;
+          print $datafile "%$location:$tmp\n";
+        }
+      } elsif ($ipprefix->masklen <= 24) {
+        foreach ($ipprefix->split(24)) {
+          my $tmp = $_->addr;
+          $tmp =~ s/\.\d+$//;
+          print $datafile "%$location:$tmp\n";
+        }
+      } else {
+        foreach ($ipprefix->split(32)) {
+          print $datafile "%$location:".$_->addr."\n";
+        }
+      }
     }
     print $datafile "%$location\n" if !$lochash->{$location}{iplist};
@@ -4667 +4875 @@
         $ttl = '' if $ttl == '0';
 
-        _printrec_tiny($datafile, 'n', \%recflags,
-                $dom, $host, $type, $val, $dist, $weight, $port, $ttl, $loc, $stamp);
+        # Spaces are evil.
+        $host =~ s/^\s+//;
+        $host =~ s/\s+$//;
+        if ($typemap{$type} ne 'TXT') {
+          # Leading or trailng spaces could be legit in TXT records.
+          $val =~ s/^\s+//;
+          $val =~ s/\s+$//;
+        }
 
         _printrec_tiny(*ZONECACHE, 'n', \%recflags,
                 $dom, $host, $type, $val, $dist, $weight, $port, $ttl, $loc, $stamp)
                 if *ZONECACHE;
+
         # in case the zone shrunk, get rid of garbage at the end of the file.
         truncate(ZONECACHE, tell(ZONECACHE));
@@ -4678 +4893 @@
         $recflags{$recid} = 1;
       } # while ($recsth)
-    } else {
-      # domain not changed, stream from cache
-      print $datafile $_ while <ZONECACHE>;
-    }
+    }
+    # stream from cache, whether freshly created or existing
+    print $datafile $_ while <ZONECACHE>;
     close ZONECACHE;
     # mark domain as unmodified
@@ -4723 +4937 @@
       $soasth->execute($revid);
       my (@zsoa) = $soasth->fetchrow_array();
-      _printrec_tiny($datafile,'y',\%recflags,$revzone,
+      _printrec_tiny(*ZONECACHE,'y',\%recflags,$revzone,
         $zsoa[0],$zsoa[1],$zsoa[2],$zsoa[3],$zsoa[4],$zsoa[5],$zsoa[6],$zsoa[8],'');
 
@@ -4745 +4959 @@
         $ttl = '' if $ttl == '0';
 
-        _printrec_tiny($datafile, 'y', \%recflags, $revzone,
-                $host, $type, $val, $dist, $weight, $port, $ttl, $loc, $stamp);
         _printrec_tiny(*ZONECACHE, 'y', \%recflags, $revzone,
                 $host, $type, $val, $dist, $weight, $port, $ttl, $loc, $stamp)
                 if *ZONECACHE;
-        # in case the zone shrunk, get rid of garbage at the end of the file.
-        truncate(ZONECACHE, tell(ZONECACHE));
+
+        # in case the zone shrunk, get rid of garbage at the end of the file.
+        truncate(ZONECACHE, tell(ZONECACHE));
 
         $recflags{$recid} = 1;
       } # while ($recsth)
-    } else {
-      # zone not changed, stream from cache
-      print $datafile $_ while <ZONECACHE>;
-    }
+    }
+    # stream from cache, whether freshly created or existing
+    print $datafile $_ while <ZONECACHE>;
     close ZONECACHE;
-    # mark domain as unmodified
+    # mark zone as unmodified
     $zonesth->execute($revid);
   } # while ($domsth)
@@ -4806 +5018 @@
       next if $$recflags{$ip};
       $$recflags{$ip}++;
+      next if $hpat eq '%blank%';       # Allows blanking a subnet so no records are published.
       my $rec = $hpat;  # start fresh with the template for each IP
       _template4_expand(\$rec, $ip);
@@ -5092 +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) = @_;
 

branches/stable/dns-1.0-1.2.sql

@@ -95 +95 @@
 COPY rectypes (val, name, stdflag, listorder, alphaorder) FROM stdin;
 1       A       1       1       1
-2       NS      2       9       37
+2       NS      2       10      37
 3       MD      5       255     29
 4       MF      5       255     30
-5       CNAME   2       11      9
+5       CNAME   2       12      9
 6       SOA     0       0       53
 7       MB      5       255     28
@@ -108 +108 @@
 13      HINFO   5       255     18
 14      MINFO   5       255     32
-15      MX      1       10      34
-16      TXT     2       12      60
+15      MX      1       11      34
+16      TXT     2       13      60
 17      RP      4       255     48
 18      AFSDB   5       255     4
@@ -126 +126 @@
 31      EID     5       255     15
 32      NIMLOC  5       255     36
-33      SRV     1       13      55
+33      SRV     1       14      55
 34      ATMA    5       255     6
 35      NAPTR   5       255     35
@@ -167 +167 @@
 65282   PTR template    3       6       2
 65283   A+PTR template  2       7       2
-65284   AAAA+PTR template       8       13      2
-65285   Delegation      2       8       2
+65284   AAAA+PTR template       2       8       2
+65285   Delegation      2       9       2
 \.
 

branches/stable/dns-rpc.cgi

@@ -24 +24 @@
 # don't remove!  required for GNU/FHS-ish install from tarball
 use lib '.';    ##uselib##
-
-use DNSDB;      # note we're not importing subs;  this lets us (ab)use the same sub names here for convenience
-use Data::Dumper;
-
+use DNSDB;
+
+use FCGI;
 #use Frontier::RPC2;
 use Frontier::Responder;
@@ -39 +38 @@
 #package main;
 
-DNSDB::loadConfig(rpcflag => 1);
-
-# need to create a DNSDB object too
-my ($dbh,$msg) = DNSDB::connectDB($DNSDB::config{dbname}, $DNSDB::config{dbuser},
-        $DNSDB::config{dbpass}, $DNSDB::config{dbhost});
-
-DNSDB::initGlobals($dbh);
+my $dnsdb = DNSDB->new();
 
 my $methods = {
@@ -56 +49 @@
         'dnsdb.updateUser'      => \&updateUser,
         'dnsdb.delUser'         => \&delUser,
+        'dnsdb.getLocDropdown'  => \&getLocDropdown,
         'dnsdb.getSOA'          => \&getSOA,
         'dnsdb.getRecLine'      => \&getRecLine,
@@ -62 +56 @@
         'dnsdb.addRec'          => \&addRec,
         'dnsdb.updateRec'       => \&updateRec,
+        'dnsdb.addOrUpdateRevRec'       => \&addOrUpdateRevRec,
         'dnsdb.delRec'          => \&delRec,
+        'dnsdb.delByCIDR'       => \&delByCIDR,
+#sub getLogCount {}
+#sub getLogEntries {}
+        'dnsdb.getRevPattern'   => \&getRevPattern,
         'dnsdb.zoneStatus'      => \&zoneStatus,
+        'dnsdb.getZonesByCIDR'  => \&getZonesByCIDR,
 
         'dnsdb.getMethods'      => \&get_method_list
 };
 
-my $res = Frontier::Responder->new(
+my $reqcnt = 0;
+
+while (FCGI::accept >= 0) {
+  my $res = Frontier::Responder->new(
         methods => $methods
         );
 
-# "Can't do that" errors
-if (!$dbh) {
-  print "Content-type: text/xml\n\n".$res->{_decode}->encode_fault(5, $msg);
-  exit;
-}
-##fixme:  fail on missing rpcuser/rpcsystem args
-
-print $res->answer;
+  # "Can't do that" errors
+  if (!$dnsdb) {
+    print "Content-type: text/xml\n\n".$res->{_decode}->encode_fault(5, $dnsdb->err);
+  } else {
+    print $res->answer;
+  }
+  last if $reqcnt++ > $dnsdb->{maxfcgi};
+} # while FCGI::accept
+
 
 exit;
@@ -87 +91 @@
 ##
 
-# Utility subs
+# Check RPC ACL
 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;
 }
@@ -104 +108 @@
     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}) );
+  }
+}
+
+# set location to the zone's default location if none is specified
+sub _loccheck {
+  my $argref = shift;
+  if (!$argref->{location} && $argref->{defrec} eq 'n') {
+    $argref->{location} = $dnsdb->getZoneLocation($argref->{revrec}, $argref->{parent_id});
+  }
+}
+
+# set ttl to zone defailt minttl if none is specified
+sub _ttlcheck {
+  my $argref = shift;
+  if (!$argref->{ttl}) {
+    my $tmp = $dnsdb->getSOA($argref->{defrec}, $argref->{revrec}, $argref->{parent_id});
+    $argref->{ttl} = $tmp->{minttl};
   }
 }
@@ -124 +145 @@
   _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
@@ -138 +159 @@
   # 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';
@@ -160 +181 @@
   _commoncheck(\%args, 'y');
 
-  my ($code, $msg) = DNSDB::addRDNS($dbh, $args{revzone}, $args{revpatt}, $args{group}, $args{state});
-  die $msg if $code eq 'FAIL';
+  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
 }
@@ -182 +203 @@
         };
 ## optional $inhert arg?
-  my ($code,$msg) = DNSDB::addGroup($dbh, $args{groupname}, $args{parent_id}, $perms);
+  my ($code,$msg) = $dnsdb->addGroup($args{groupname}, $args{parent_id}, $perms);
   die $msg if $code eq 'FAIL';
   return $msg;
@@ -196 +217 @@
   # Let's be nice;  delete based on groupid OR group name.  Saves an RPC call round-trip, maybe.
   if ($args{group} =~ /^\d+$/) {
-    ($code,$msg) = DNSDB::delGroup($dbh, $args{group});
+    ($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($dbh, $grpid);
+    ($code,$msg) = $dnsdb->delGroup($grpid);
   }
   die $msg if $code eq 'FAIL';
@@ -227 +248 @@
     push @userargs, $args{$argname};
   }
-  my ($code,$msg) = DNSDB::addUser($dbh, @userargs);
+  my ($code,$msg) = $dnsdb->addUser(@userargs);
   die $msg if $code eq 'FAIL';
   return $msg;
@@ -253 +274 @@
 ##fixme:  also underlying in DNSDB::updateUser():  no way to just update this or that attribute;
 #         have to pass them all in to be overwritten
-  my ($code,$msg) = DNSDB::updateUser($dbh, @userargs);
+  my ($code,$msg) = $dnsdb->updateUser(@userargs);
   die $msg if $code eq 'FAIL';
   return $msg;
@@ -264 +285 @@
 
   die "Missing UID\n" if !$args{uid};
-  my ($code,$msg) = DNSDB::delUser($dbh, $args{uid});
+  my ($code,$msg) = $dnsdb->delUser($args{uid});
   die $msg if $code eq 'FAIL';
   return $msg;
@@ -279 +300 @@
 #sub getLocCount {}
 #sub getLocList {}
-#sub getLocDropdown {}
+
+sub getLocDropdown {
+  my %args = @_;
+
+  _commoncheck(\%args);
+  $args{defloc} = '' if !$args{defloc};
+
+  my $ret = $dnsdb->getLocDropdown($args{group}, $args{defloc});
+  return $ret;
+}
 
 sub getSOA {
@@ -286 +316 @@
   _commoncheck(\%args);
 
-  my $ret = DNSDB::getSOA($dbh, $args{defrec}, $args{revrec}, $args{id});
+  my $ret = $dnsdb->getSOA($args{defrec}, $args{revrec}, $args{id});
   if (!$ret) {
     if ($args{defrec} eq 'y') {
@@ -304 +334 @@
   _commoncheck(\%args);
 
-  my $ret = DNSDB::getRecLine($dbh, $args{defrec}, $args{revrec}, $args{id});
-
-  die $DNSDB::errstr if !$ret;
+  my $ret = $dnsdb->getRecLine($args{defrec}, $args{revrec}, $args{id});
+
+  die $dnsdb->errstr if !$ret;
 
   return $ret;
@@ -323 +353 @@
   $args{direction} = 'ASC' if !$args{direction};
 
-  my $ret = DNSDB::getDomRecs($dbh, (defrec => $args{defrec}, revrec => $args{revrec}, id => $args{id},
+  my $ret = $dnsdb->getDomRecs(defrec => $args{defrec}, revrec => $args{revrec}, id => $args{id},
         offset => $args{offset}, sortby => $args{sortby}, sortorder => $args{sortorder},
-        filter => $args{filter}) );
-
-  die $DNSDB::errstr if !$ret;
+        filter => $args{filter});
+
+  die $dnsdb->errstr if !$ret;
 
   return $ret;
@@ -344 +374 @@
   $args{direction} = 'ASC' if !$args{direction};
 
-  my $ret = DNSDB::getRecCount($dbh, $args{defrec}, $args{revrec}, $args{id}, $args{filter});
-
-  die $DNSDB::errstr if !$ret;
+  my $ret = $dnsdb->getRecCount($args{defrec}, $args{revrec}, $args{id}, $args{filter});
+
+  die $dnsdb->errstr if !$ret;
 
   return $ret;
@@ -356 +386 @@
   _commoncheck(\%args, 'y');
 
-  # add records in the zone's default location if none is specified
-  if (!$args{location} && $args{defrec} eq 'n') {
-    $args{location} = DNSDB::getZoneLocation($dbh, $args{revrec}, $args{parent_id});
-  }
-
-  my @recargs = ($dbh, $args{defrec}, $args{revrec}, $args{parent_id},
+  _loccheck(\%args);
+  _ttlcheck(\%args);
+
+  my @recargs = ($args{defrec}, $args{revrec}, $args{parent_id},
         \$args{name}, \$args{type}, \$args{address}, $args{ttl}, $args{location});
   if ($args{type} == $DNSDB::reverse_typemap{MX} or $args{type} == $DNSDB::reverse_typemap{SRV}) {
@@ -371 +399 @@
   }
 
-  my ($code, $msg) = DNSDB::addRec(@recargs);
+  my ($code, $msg) = $dnsdb->addRec(@recargs);
 
   die $msg if $code eq 'FAIL';
@@ -381 +409 @@
 
   _commoncheck(\%args, 'y');
+
+  # get old line, so we can update only the bits that the caller passed to change
+  # note we subbed address for val since it's a little more caller-friendly
+  my $oldrec = $dnsdb->getRecLine($args{defrec}, $args{revrec}, $args{id});
+  foreach my $field (qw(name type address ttl location distance weight port)) {
+    $args{$field} = $oldrec->{$field} if !$args{$field} && defined($oldrec->{$field});
+  }
 
   # note dist, weight, port are not required on all types;  will be ignored if not needed.
   # parent_id is the "primary" zone we're updating;  necessary for forward/reverse voodoo
-  my ($code, $msg) = DNSDB::updateRec($dbh, $args{defrec}, $args{revrec}, $args{id}, $args{parent_id},
+  my ($code, $msg) = $dnsdb->updateRec($args{defrec}, $args{revrec}, $args{id}, $args{parent_id},
         \$args{name}, \$args{type}, \$args{address}, $args{ttl}, $args{location},
         $args{distance}, $args{weight}, $args{port});
@@ -392 +427 @@
 }
 
+# Takes a passed CIDR block and DNS pattern;  adds a new record or updates the record(s) affected
+sub addOrUpdateRevRec {
+  my %args = @_;
+
+  _commoncheck(\%args, 'y');
+  my $cidr = new NetAddr::IP $args{cidr};
+
+  my $zonelist = $dnsdb->getZonesByCIDR(%args);
+  if (scalar(@$zonelist) == 0) {
+    # enhh....  WTF?
+  } elsif (scalar(@$zonelist) == 1) {
+    # check if the single zone returned is bigger than the CIDR.  if so, we can just add a record
+    my $zone = new NetAddr::IP $zonelist->[0]->{revnet};
+    if ($zone->contains($cidr)) {
+      # We need to strip the CIDR mask on IPv4 /32 assignments, or we just add a new record all the time.
+      my $filt = ($cidr->{isv6} || $cidr->masklen != 32 ? "$cidr" : $cidr->addr);
+      my $reclist = $dnsdb->getDomRecs(defrec => 'n', revrec => 'y',
+        id => $zonelist->[0]->{rdns_id}, filter => $filt);
+      if (scalar(@$reclist) == 0) {
+        # Aren't Magic Numbers Fun?  See pseudotype list in dnsadmin.
+        my $type = ($cidr->{isv6} ? 65284 : ($cidr->masklen == 32 ? 65280 : 65283) );
+        addRec(defrec =>'n', revrec => 'y', parent_id => $zonelist->[0]->{rdns_id}, type => $type,
+          address => "$cidr", %args);
+      } else {
+        my $flag = 0;
+        foreach my $rec (@$reclist) {
+          # pure PTR plus composite types
+          next unless $rec->{type} == 12 || $rec->{type} == 65280 || $rec->{type} == 65281
+                || $rec->{type} == 65282 || $rec->{type} == 65283 || $rec->{type} == 65284;
+          next unless $rec->{val} eq $filt;     # make sure we really update the record we want to update.
+          $dnsdb->updateRec(defrec =>'n', revrec => 'y', id => $rec->{record_id},
+            parent_id => $zonelist->[0]->{rdns_id}, %args);
+          $flag = 1;
+          last; # only do one record.
+        }
+        unless ($flag) {
+          # Nothing was updated, so we didn't really have a match.  Add as per @$reclist==0
+          # Aren't Magic Numbers Fun?  See pseudotype list in dnsadmin.
+          my $type = ($cidr->{isv6} ? 65282 : ($cidr->masklen == 32 ? 65280 : 65283) );
+          $dnsdb->addRec(defrec =>'n', revrec => 'y', parent_id => $zonelist->[0]->{rdns_id}, type => $type,
+            address => "$cidr", %args);
+        }
+      }
+    } else {
+      # ebbeh?  CIDR is only partly represented in DNS.  This needs manual intervention.
+    } # done single-zone-contains-$cidr
+  } else {
+    # Overlapping reverse zones shouldn't be possible, so if we're here we've got a CIDR
+    # that spans multiple reverse zones (eg, /23 CIDR -> 2 /24 rzones)
+    foreach my $zdata (@$zonelist) {
+      my $reclist = $dnsdb->getDomRecs(defrec => 'n', revrec => 'y',
+        id => $zdata->{rdns_id}, filter => $zdata->{revnet});
+      if (scalar(@$reclist) == 0) {
+        my $type = ($args{cidr}->{isv6} ? 65282 : ($args{cidr}->masklen == 32 ? 65280 : 65283) );
+        $dnsdb->addRec(defrec =>'n', revrec => 'y', parent_id => $zdata->{rdns_id}, type => $type,
+          address => "$args{cidr}", %args);
+      } else {
+        foreach my $rec (@$reclist) {
+          # only the composite and/or template types;  pure PTR or nontemplate composite
+          # types are nominally impossible here.
+          next unless $rec->{type} == 65282 || $rec->{type} == 65283 || $rec->{type} == 65284;
+          $dnsdb->updateRec(defrec =>'n', revrec => 'y', id => $rec->{record_id},
+            parent_id => $zdata->{rdns_id}, %args);
+          last; # only do one record.
+        }
+      }
+    } # iterate zones within $cidr
+  } # done $cidr-contains-zones
+}
+
 sub delRec {
   my %args = @_;
@@ -397 +502 @@
   _commoncheck(\%args, 'y');
 
-  my ($code, $msg) = DNSDB::delRec($dbh, $args{defrec}, $args{recrev}, $args{id});
-
-  die $msg if $code eq 'FAIL';
-  return $msg;
-}
+  my ($code, $msg) = $dnsdb->delRec($args{defrec}, $args{recrev}, $args{id});
+
+  die $msg if $code eq 'FAIL';
+  return $msg;
+}
+
+sub delByCIDR {
+  my %args = @_;
+
+  _commoncheck(\%args, 'y');
+
+  # much like addOrUpdateRevRec()
+  my $zonelist = $dnsdb->getZonesByCIDR(%args);
+  my $cidr = new NetAddr::IP $args{cidr};
+
+  if (scalar(@$zonelist) == 0) {
+    # enhh....  WTF?
+  } elsif (scalar(@$zonelist) == 1) {
+
+    # check if the single zone returned is bigger than the CIDR
+    my $zone = new NetAddr::IP $zonelist->[0]->{revnet};
+    if ($zone->contains($cidr)) {
+
+      if ($args{delsubs}) {
+        # Delete ALL EVARYTHING!!one11!! in $args{cidr}
+        my $reclist = $dnsdb->getDomRecs(defrec => 'n', revrec => 'y', id => $zonelist->[0]->{rdns_id});
+        foreach my $rec (@$reclist) {
+          my $reccidr = new NetAddr::IP $rec->{val};
+          next unless $cidr->contains($reccidr);
+          next unless $rec->{type} == 12 || $rec->{type} == 65280 || $rec->{type} == 65281 ||
+                      $rec->{type} == 65282 || $rec->{type} == 65283 ||$rec->{type} == 65284;
+          ##fixme:  multiple records, wanna wax'em all, how to report errors?
+          if ($args{delforward} ||
+              $rec->{type} == 12 || $rec->{type} == 65282 ||
+              $rec->{type} == 65283 || $rec->{type} == 65284) {
+            my ($code,$msg) = $dnsdb->delRec('n', 'y', $rec->{record_id});
+          } else {
+            my $ret = $dnsdb->downconvert($rec->{record_id}, $DNSDB::reverse_typemap{A});
+          }
+        }
+        if ($args{parpatt} && $zone == $cidr) {
+          # Edge case;  we've just gone and axed all the records in the reverse zone.
+          # Re-add one to match the parent if we've been given a pattern to use.
+          $dnsdb->addRec(defrec =>'n', revrec => 'y', parent_id => $zonelist->[0]->{rdns_id},
+                 type => ($zone->{isv6} ? 65284 : 65283), address => "$cidr", %args);
+        }
+
+      } else {
+        # Selectively delete only exact matches on $args{cidr}
+
+        # We need to strip the CIDR mask on IPv4 /32 assignments, or we can't find single-IP records
+        my $filt = ($cidr->{isv6} || $cidr->masklen != 32 ? "$cidr" : $cidr->addr);
+        my $reclist = $dnsdb->getDomRecs(defrec => 'n', revrec => 'y',
+          id => $zonelist->[0]->{rdns_id}, filter => $filt, sortby => 'val', sortorder => 'DESC');
+        foreach my $rec (@$reclist) {
+          my $reccidr = new NetAddr::IP $rec->{val};
+          next unless $cidr == $reccidr;
+          next unless $rec->{type} == 12 || $rec->{type} == 65280 || $rec->{type} == 65281 ||
+                      $rec->{type} == 65282 || $rec->{type} == 65283 ||$rec->{type} == 65284;
+          if ($args{delforward} || $rec->{type} == 12) {
+            my ($code,$msg) = $dnsdb->delRec('n', 'y', $rec->{record_id});
+            die $msg if $code eq 'FAIL';
+            return $msg;
+          } else {
+            my $ret = $dnsdb->downconvert($rec->{record_id}, $DNSDB::reverse_typemap{A});
+            die $dnsdb->errstr if !$ret;
+            return "A+PTR for $args{cidr} split and PTR removed";
+          }
+        } # foreach @$reclist
+      }
+
+    } else {  # $cidr > $zone but we only have one zone
+      # ebbeh?  CIDR is only partly represented in DNS.  This needs manual intervention.
+      return "Warning:  $args{cidr} is only partly represented in DNS.  Check and remove DNS records manually.";
+    } # done single-zone-contains-$cidr
+
+  } else {  # multiple zones nominally "contain" $cidr
+    # Overlapping reverse zones shouldn't be possible, so if we're here we've got a CIDR
+    # that spans multiple reverse zones (eg, /23 CIDR -> 2 /24 rzones)
+    foreach my $zdata (@$zonelist) {
+      my $reclist = $dnsdb->getDomRecs(defrec => 'n', revrec => 'y', id => $zdata->{rdns_id});
+      if (scalar(@$reclist) == 0) {
+# nothing to do?  or do we (re)add a record based on the parent?
+# yes, yes we do, past the close of the else
+#        my $type = ($args{cidr}->{isv6} ? 65282 : ($args{cidr}->masklen == 32 ? 65280 : 65283) );
+#        addRec(defrec =>'n', revrec => 'y', parent_id => $zdata->{rdns_id}, type => $type,
+#          address => "$args{cidr}", %args);
+      } else {
+        foreach my $rec (@$reclist) {
+          next unless $rec->{type} == 12 || $rec->{type} == 65280 || $rec->{type} == 65281 ||
+                      $rec->{type} == 65282 || $rec->{type} == 65283 || $rec->{type} == 65284;
+          # Template types are only useful when attached to a reverse zone.
+##fixme  ..... or ARE THEY?
+          if ($args{delforward} ||
+              $rec->{type} == 12 || $rec->{type} == 65282 ||
+              $rec->{type} == 65283 || $rec->{type} == 65284) {
+            my ($code,$msg) = $dnsdb->delRec('n', 'y', $rec->{record_id});
+          } else {
+            my $ret = $dnsdb->downconvert($rec->{record_id}, $DNSDB::reverse_typemap{A});
+          }
+        } # foreach @$reclist
+      } # nrecs != 0
+      if ($args{parpatt}) {
+        # We've just gone and axed all the records in the reverse zone.
+        # Re-add one to match the parent if we've been given a pattern to use.
+        $dnsdb->addRec(defrec =>'n', revrec => 'y', parent_id => $zdata->{rdns_id},
+               type => ($cidr->{isv6} ? 65284 : 65283),
+               address => $zdata->{revnet}, name => $args{parpatt}, %args);
+      }
+    } # iterate zones within $cidr
+  } # done $cidr-contains-zones
+
+} # end delByCIDR()
 
 #sub getLogCount {}
 #sub getLogEntries {}
+
+sub getRevPattern {
+  my %args = @_;
+
+  _commoncheck(\%args, 'y');
+
+  return $dnsdb->getRevPattern($args{cidr}, $args{group});
+}
+
 #sub getTypelist {}
 #sub parentID {}
@@ -414 +636 @@
   _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);
+}
+
+# Get a list of hashes referencing the reverse zone(s) for a passed CIDR block
+sub getZonesByCIDR {
+  my %args = @_;
+
+  _commoncheck(\%args, 'y');
+
+  return $dnsdb->getZonesByCIDR(%args);
 }
 

branches/stable/dns.cgi

@@ -45 +45 @@
 use lib '.';    ##uselib##
 
-use DNSDB qw(:ALL);
+use DNSDB;
 
 my @debugbits;  # temp, to be spit out near the end of processing
@@ -69 +69 @@
 # we'll catch a bad DB connect string once we get to trying that
 ##fixme:  pass params to loadConfig, and use them there, to allow one codebase to support multiple sites
-if (!loadConfig()) {
-  warn "Using default configuration;  unable to load custom settings: $DNSDB::errstr";
+my $dnsdb = new DNSDB;
+
+my $header = HTML::Template->new(filename => "$templatedir/header.tmpl");
+my $footer = HTML::Template->new(filename => "$templatedir/footer.tmpl");
+$footer->param(version => $DNSDB::VERSION);
+
+if (!$dnsdb) {
+  print "Content-type: text/html\n\n";
+  print $header->output;
+  my $errpage = HTML::Template->new(filename => "$templatedir/dberr.tmpl");
+  $errpage->param(errmsg => $DNSDB::errstr);
+  print $errpage->output;
+  print $footer->output;
+  exit;
 }
+
+$header->param(orgname => $dnsdb->{orgname}) if $dnsdb->{orgname} ne 'Example Corp';
 
 # persistent stuff needed on most/all pages
 my $sid = ($webvar{sid} ? $webvar{sid} : undef);
-my $session = new CGI::Session("driver:File", $sid, {Directory => $config{sessiondir}})
+my $session = new CGI::Session("driver:File", $sid, {Directory => $dnsdb->{sessiondir}})
         or die CGI::Session->errstr();
 #$sid = $session->id() if !$sid;
@@ -81 +95 @@
   # init stuff.  can probably axe this down to just above if'n'when user manipulation happens
   $sid = $session->id();
-  $session->expire($config{timeout});
+  $session->expire($dnsdb->{timeout});
 # need to know the "upper" group the user can deal with;  may as well
 # stick this in the session rather than calling out to the DB every time.
@@ -149 +163 @@
 push @filterargs, $filter if $filter;
 
-# nrgh, can't handle login here because we don't have a database handle to check the user/pass with yet
-
-my $header = HTML::Template->new(filename => "$templatedir/header.tmpl");
-my $footer = HTML::Template->new(filename => "$templatedir/footer.tmpl");
-$header->param(orgname => $config{orgname}) if $config{orgname} ne 'Example Corp';
-$footer->param(version => $DNSDB::VERSION);
-
 ## set up "URL to self"
 # @#$%@%@#% XHTML - & in a URL must be escaped.  >:(
@@ -179 +186 @@
 # pagination
 my $perpage = 15;
-$perpage = $config{perpage} if $config{perpage};
+$perpage = $dnsdb->{perpage} if $dnsdb->{perpage};
 my $offset = ($webvar{offset} ? $webvar{offset} : 0);
 
@@ -186 +193 @@
 my $sortorder = "ASC";
 
-##fixme: quit throwing the database handle around, and put all the SQL and direct DB fiddling into DNSDB.pm
-# dbname, user, pass, host (optional)
-my ($dbh,$msg) = connectDB($config{dbname}, $config{dbuser}, $config{dbpass}, $config{dbhost});
-
-if (!$dbh) {
-  print "Content-type: text/html\n\n";
-  print $header->output;
-  my $errpage = HTML::Template->new(filename => "$templatedir/dberr.tmpl");
-  $errpage->param(errmsg => $msg);
-  print $errpage->output;
-  print $footer->output;
-  exit;
-}
-
-# Load config pieces from the database.  Ideally all but the DB user/pass/etc should be loaded here.
-initGlobals($dbh);
-
 # security check - does the user have permission to view this entity?
 # this is a prep step used "many" places
 my @viewablegroups;
-getChildren($dbh, $logingroup, \@viewablegroups, 'all');
+$dnsdb->getChildren($logingroup, \@viewablegroups, 'all');
 push @viewablegroups, $logingroup;
 
@@ -232 +222 @@
     # Snag ACL/permissions here too
 
-    my $userdata = login($dbh, $webvar{username}, $webvar{password});
+    my $userdata = $dnsdb->login($webvar{username}, $webvar{password});
 
     if ($userdata) {
@@ -293 +283 @@
 # but if they keep the session active they'll continue to have access long after being disabled.  :/
 # Treat it as a session expiry.
-if ($session->param('uid') && !userStatus($dbh, $session->param('uid')) ) {
+if ($session->param('uid') && !$dnsdb->userStatus($session->param('uid')) ) {
   $sid = '';
   $session->delete;     # force expiry of the session Right Away
@@ -301 +291 @@
 
 # Misc Things To Do on most pages
-initPermissions($dbh, $session->param('uid'));
-initActionLog($dbh, $session->param('uid'));
+my %permissions;
+$dnsdb->getPermissions('user', $session->param('uid'), \%permissions);
+$dnsdb->initActionLog($session->param('uid'));
 
 $page->param(sid => $sid) unless $webvar{page} eq 'login';      # no session ID on the login page
@@ -322 +313 @@
     my $flag = 0;
     foreach (@viewablegroups) {
-      $flag = 1 if isParent($dbh, $_, 'group', $webvar{id}, 'domain');
+      $flag = 1 if $dnsdb->isParent($_, 'group', $webvar{id}, 'domain');
     }
     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 {
@@ -372 +363 @@
   $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') {
-    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"));
@@ -402 +393 @@
 
     $page->param(del_getconf => 1);
-    $page->param(domain => domainName($dbh,$webvar{id}));
+    $page->param(domain => $dnsdb->domainName($webvar{id}));
 
   } elsif ($webvar{del} eq 'ok') {
-    my $pargroup = parentID($dbh, (id => $webvar{id}, type => 'domain', revrec => $webvar{revrec}));
-    my ($code,$msg) = delZone($dbh, $webvar{id}, $webvar{revrec});
+    my $pargroup = $dnsdb->parentID(id => $webvar{id}, type => 'domain', revrec => $webvar{revrec});
+    my ($code,$msg) = $dnsdb->delZone($webvar{id}, $webvar{revrec});
     if ($code eq 'OK') {
       changepage(page => "domlist", resultmsg => $msg);
@@ -426 +417 @@
     my $flag = 0;
     foreach (@viewablegroups) {
-      $flag = 1 if isParent($dbh, $_, 'group', $webvar{id}, 'revzone');
+      $flag = 1 if $dnsdb->isParent($_, 'group', $webvar{id}, 'revzone');
     }
     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 {
@@ -449 +440 @@
 
   fill_grouplist("grouplist");
+  my $loclist = $dnsdb->getLocDropdown($curgroup);
+  $page->param(loclist => $loclist);
 
   # 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')) {
@@ -472 +465 @@
   }
 
-  my ($code,$msg) = addRDNS($dbh, $webvar{revzone}, $webvar{revpatt}, $webvar{group},
-        ($webvar{makeactive} eq 'on' ? 1 : 0));
+  my ($code,$msg) = $dnsdb->addRDNS($webvar{revzone}, $webvar{revpatt}, $webvar{group},
+        ($webvar{makeactive} eq 'on' ? 1 : 0), $webvar{location});
 
   if ($code eq 'OK') {
@@ -500 +493 @@
 
     $page->param(del_getconf => 1);
-    $page->param(revzone => revName($dbh,$webvar{id}));
+    $page->param(revzone => $dnsdb->revName($webvar{id}));
 
   } elsif ($webvar{del} eq 'ok') {
-    my $pargroup = parentID($dbh, (id => $webvar{id}, type => 'revzone', revrec => $webvar{revrec}));
-    my $zone = revName($dbh, $webvar{id});
-    my ($code,$msg) = delZone($dbh, $webvar{id}, 'y');
+    my $pargroup = $dnsdb->parentID(id => $webvar{id}, type => 'revzone', revrec => $webvar{revrec});
+    my $zone = $dnsdb->revName($webvar{id});
+    my ($code,$msg) = $dnsdb->delZone($webvar{id}, 'y');
     if ($code eq 'OK') {
       changepage(page => "revzones", resultmsg => $msg);
@@ -551 +544 @@
     $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';
@@ -577 +570 @@
 # fill the page-count and first-previous-next-last-all details
     fill_pgcount($count,"records",
-        ($webvar{defrec} eq 'y' ? "group ".groupName($dbh,$webvar{id}) : 
-                ($webvar{revrec} eq 'y' ? revName($dbh,$webvar{id}) : domainName($dbh,$webvar{id}))
+        ($webvar{defrec} eq 'y' ? "group ".$dnsdb->groupName($webvar{id}) : 
+                ($webvar{revrec} eq 'y' ? $dnsdb->revName($webvar{id}) : $dnsdb->domainName($webvar{id}))
         ));
     fill_fpnla($count);  # should put some params on this sub...
@@ -633 +626 @@
 
     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);
     }
@@ -643 +636 @@
 
     # 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});
 
-    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};
@@ -656 +649 @@
     }
 
-    my ($code,$msg) = addRec(@recargs);
+    my ($code,$msg) = $dnsdb->addRec(@recargs);
 
     if ($code eq 'OK' || $code eq 'WARN') {
@@ -687 +680 @@
     $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});
@@ -694 +687 @@
     $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') {
@@ -706 +699 @@
 
     # 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') {
@@ -732 +725 @@
 
   if ($webvar{defrec} eq 'y') {
-    $page->param(dohere => "default records in group ".groupName($dbh,$webvar{parentid}));
+    $page->param(dohere => "default records in group ".$dnsdb->groupName($webvar{parentid}));
   } else {
-    $page->param(dohere => domainName($dbh,$webvar{parentid})) if $webvar{revrec} eq 'n';
-    $page->param(dohere => revName($dbh,$webvar{parentid})) if $webvar{revrec} eq 'y';
+    $page->param(dohere => $dnsdb->domainName($webvar{parentid})) if $webvar{revrec} eq 'n';
+    $page->param(dohere => $dnsdb->revName($webvar{parentid})) if $webvar{revrec} eq 'y';
   }
 
@@ -764 +757 @@
   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},
@@ -824 +817 @@
         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},
@@ -878 +871 @@
       }
     }
-    # not gonna provide the 4th param: template-or-clone flag, just yet
-    my ($code,$msg) = addGroup($dbh, $webvar{newgroup}, $webvar{pargroup}, \%newperms);
+    # force inheritance of parent group's default records with inherit flag,
+    # otherwise we end up with the hardcoded defaults from DNSDB.pm.  See
+    # https://secure.deepnet.cx/trac/dnsadmin/ticket/8 for the UI enhancement
+    # that will make this variable.
+    my ($code,$msg) = $dnsdb->addGroup($webvar{newgroup}, $webvar{pargroup}, \%newperms, 1);
     if ($code eq 'OK') {
       if ($alterperms) {
@@ -898 +894 @@
     # fill default permissions with immediate parent's current ones
     my %parperms;
-    getPermissions($dbh, 'group', $curgroup, \%parperms);
+    $dnsdb->getPermissions('group', $curgroup, \%parperms);
     fill_permissions($page, \%parperms);
   }
@@ -922 +918 @@
 
   } elsif ($webvar{del} eq 'ok') {
-    my ($code,$msg) = delGroup($dbh, $webvar{id});
+    my ($code,$msg) = $dnsdb->delGroup($webvar{id});
     if ($code eq 'OK') {
 ##fixme: need to clean up log when deleting a major container
@@ -934 +930 @@
     changepage(page => "grpman");
   }
-  $page->param(delgroupname => groupName($dbh, $webvar{id}));
+  $page->param(delgroupname => $dnsdb->groupName($webvar{id}));
 
 } elsif ($webvar{page} eq 'edgroup') {
@@ -949 +945 @@
     # extra safety check;  make sure user can't construct a URL to bypass ACLs
     my %curperms;
-    getPermissions($dbh, 'group', $webvar{gid}, \%curperms);
+    $dnsdb->getPermissions('group', $webvar{gid}, \%curperms);
     my %chperms;
     my $alterperms = 0;
@@ -968 +964 @@
       }
     }
-    my ($code,$msg) = changePermissions($dbh, 'group', $webvar{gid}, \%chperms);
+    my ($code,$msg) = $dnsdb->changePermissions('group', $webvar{gid}, \%chperms);
     if ($code eq 'OK') {
       if ($alterperms) {
         changepage(page => "grpman", warnmsg =>
                 "You can only grant permissions you hold.  Default permissions in group ".
-                groupName($dbh, $webvar{gid})." updated with reduced access");
+                $dnsdb->groupName($webvar{gid})." updated with reduced access");
       } else {
         changepage(page => "grpman", resultmsg => $msg);
@@ -983 +979 @@
   }
   $page->param(gid => $webvar{gid});
-  $page->param(grpmeddle => groupName($dbh, $webvar{gid}));
+  $page->param(grpmeddle => $dnsdb->groupName($webvar{gid}));
   my %grpperms;
-  getPermissions($dbh, 'group', $webvar{gid}, \%grpperms);
+  $dnsdb->getPermissions('group', $webvar{gid}, \%grpperms);
   fill_permissions($page, \%grpperms);
 
@@ -998 +994 @@
   fill_grouplist("grouplist");
 
-  my $count = getZoneCount($dbh, (revrec => 'n', curgroup => $curgroup) );
+  my $count = $dnsdb->getZoneCount(revrec => 'n', curgroup => $curgroup);
 
   $page->param(curpage => $webvar{page});
-  fill_pgcount($count,'domains',groupName($dbh,$curgroup));
+  fill_pgcount($count, 'domains', $dnsdb->groupName($curgroup));
   fill_fpnla($count);
   $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}) {
@@ -1031 +1027 @@
     changepage(page => "domlist", errmsg => "You are not permitted to bulk-move domains")
         unless ($permissions{admin} || ($permissions{domain_edit} && $permissions{domain_create} && $permissions{domain_delete}));
-    my $newgname = groupName($dbh,$webvar{destgroup});
+    my $newgname = $dnsdb->groupName($webvar{destgroup});
     $page->param(action => "Move to group $newgname");
   } elsif ($webvar{bulkaction} eq 'deactivate' || $webvar{bulkaction} eq 'activate') {
@@ -1061 +1057 @@
       next;
     }
-    $row{domain} = domainName($dbh,$webvar{$_});
+    $row{domain} = $dnsdb->domainName($webvar{$_});
 
     # Do the $webvar{bulkaction}
     my ($code, $msg);
-    ($code, $msg) = changeGroup($dbh, 'domain', $webvar{$_}, $webvar{destgroup})
+    ($code, $msg) = $dnsdb->changeGroup('domain', $webvar{$_}, $webvar{destgroup})
         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';
 
@@ -1097 +1093 @@
     my $flag = 0;
     foreach (@viewablegroups) {
-      $flag = 1 if isParent($dbh, $_, 'group', $webvar{id}, 'user');
+      $flag = 1 if $dnsdb->isParent($_, 'group', $webvar{id}, 'user');
     }
     if ($flag && ($permissions{admin} || $permissions{user_edit} ||
         ($permissions{self_edit} && $webvar{id} == $session->param('uid')) )) {
-      my $stat = userStatus($dbh,$webvar{id},$webvar{userstatus});
+      my $stat = $dnsdb->userStatus($webvar{id}, $webvar{userstatus});
       $page->param(resultmsg => $DNSDB::resultstr);
     } else {
@@ -1129 +1125 @@
   fill_clonemelist();
   my %grpperms;
-  getPermissions($dbh, 'group', $curgroup, \%grpperms);
+  $dnsdb->getPermissions('group', $curgroup, \%grpperms);
 
   my $grppermlist = new HTML::Template(filename => "$templatedir/permlist.tmpl");
@@ -1151 +1147 @@
 
     my %newperms;       # we're going to prefill the existing permissions, so we can change them.
-    getPermissions($dbh, 'user', $webvar{uid}, \%newperms);
+    $dnsdb->getPermissions('user', $webvar{uid}, \%newperms);
 
     if ($webvar{pass1} ne $webvar{pass2}) {
@@ -1166 +1162 @@
       if (!$permissions{admin}) {
         my %grpperms;
-        getPermissions($dbh, 'group', $curgroup, \%grpperms);
+        $dnsdb->getPermissions('group', $curgroup, \%grpperms);
         my $ret = comparePermissions(\%permissions, \%grpperms);
         if ($ret eq '<' || $ret eq '!') {
@@ -1188 +1184 @@
       } elsif ($permissions{admin} && $webvar{perms_type} eq 'clone') {
         $permstring = "c:$webvar{clonesrc}";
-        getPermissions($dbh, 'user', $webvar{clonesrc}, \%newperms);
+        $dnsdb->getPermissions('user', $webvar{clonesrc}, \%newperms);
         $page->param(perm_clone => 1);
       } else {
@@ -1204 +1200 @@
                 unless $permissions{admin} || $permissions{user_create};
         # no scope check;  user is created in the current group
-        ($code,$msg) = addUser($dbh, $webvar{uname}, $curgroup, $webvar{pass1},
+        ($code,$msg) = $dnsdb->addUser($webvar{uname}, $curgroup, $webvar{pass1},
                 ($webvar{makeactive} eq 'on' ? 1 : 0), $webvar{accttype}, $permstring,
                 $webvar{fname}, $webvar{lname}, $webvar{phone});
@@ -1219 +1215 @@
 # or self-torture trying to not commit the transaction until we're really done.
         # Allowing for changing group, but not coding web support just yet.
-        ($code,$msg) = updateUser($dbh, $webvar{uid}, $webvar{uname}, $webvar{gid}, $webvar{pass1},
+        ($code,$msg) = $dnsdb->updateUser($webvar{uid}, $webvar{uname}, $webvar{gid}, $webvar{pass1},
                 ($webvar{makeactive} eq 'on' ? 1 : 0), $webvar{accttype},
                 $webvar{fname}, $webvar{lname}, $webvar{phone});
         if ($code eq 'OK') {
           $newperms{admin} = 1 if $webvar{accttype} eq 'S';
-          ($code2,$msg2) = changePermissions($dbh, 'user', $webvar{uid}, \%newperms, ($permstring eq 'i'));
+          ($code2,$msg2) = $dnsdb->changePermissions('user', $webvar{uid}, \%newperms, ($permstring eq 'i'));
         }
       }
@@ -1280 +1276 @@
     fill_clonemelist();
 
-    my $userinfo = getUserData($dbh,$webvar{user});
+    my $userinfo = $dnsdb->getUserData($webvar{user});
     fill_actypelist($userinfo->{type});
     # not using this yet, but adding it now means we can *much* more easily do so later.
@@ -1286 +1282 @@
 
     my %curperms;
-    getPermissions($dbh, 'user', $webvar{user}, \%curperms);
+    $dnsdb->getPermissions('user', $webvar{user}, \%curperms);
     fill_permissions($page, \%curperms);
 
@@ -1322 +1318 @@
   if (!defined($webvar{del})) {
     $page->param(del_getconf => 1);
-    $page->param(user => userFullName($dbh,$webvar{id}));
+    $page->param(user => $dnsdb->userFullName($webvar{id}));
   } elsif ($webvar{del} eq 'ok') {
-    my ($code,$msg) = delUser($dbh, $webvar{id});
+    my ($code,$msg) = $dnsdb->delUser($webvar{id});
     if ($code eq 'OK') {
       # success.  go back to the user list, do not pass "GO"
@@ -1368 +1364 @@
         unless ($permissions{admin} || $permissions{location_create});
 
-    my ($code,$msg) = addLoc($dbh, $curgroup, $webvar{locname}, $webvar{comments}, $webvar{iplist});
+    my ($code,$msg) = $dnsdb->addLoc($curgroup, $webvar{locname}, $webvar{comments}, $webvar{iplist});
 
     if ($code eq 'OK' || $code eq 'WARN') {
@@ -1392 +1388 @@
         unless ($permissions{admin} || $permissions{location_edit});
 
-    my $loc = getLoc($dbh, $webvar{loc});
+    my $loc = $dnsdb->getLoc($webvar{loc});
     $page->param(wastrying      => "editing");
     $page->param(todo           => "Edit location/view");
@@ -1405 +1401 @@
         unless ($permissions{admin} || $permissions{location_edit});
 
-    my ($code,$msg) = updateLoc($dbh, $webvar{id}, $curgroup, $webvar{locname}, $webvar{comments}, $webvar{iplist});
+    my ($code,$msg) = $dnsdb->updateLoc($webvar{id}, $curgroup, $webvar{locname}, $webvar{comments}, $webvar{iplist});
 
     if ($code eq 'OK') {
@@ -1443 +1439 @@
 
   $page->param(locid => $webvar{locid});
-  my $locdata = getLoc($dbh, $webvar{locid});
+  my $locdata = $dnsdb->getLoc($webvar{locid});
   $locdata->{description} = $webvar{locid} if !$locdata->{description};
   # first pass = confirm y/n (sorta)
@@ -1450 +1446 @@
     $page->param(location => $locdata->{description});
   } elsif ($webvar{del} eq 'ok') {
-    my ($code,$msg) = delLoc($dbh, $webvar{locid});
+    my ($code,$msg) = $dnsdb->delLoc($webvar{locid});
     if ($code eq 'OK') {
       # success.  go back to the user list, do not pass "GO"
@@ -1465 +1461 @@
 
   $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};
@@ -1567 +1563 @@
     foreach my $domain (@domlist) {
       my %row;
-      my ($code,$msg) = importAXFR($dbh, $webvar{ifrom}, $domain, $webvar{group},
-        $webvar{domstatus}, $webvar{rwsoa}, $webvar{rwns}, ($webvar{forcettl} ? $webvar{newttl} : 0),
-        $webvar{mergematching});
+      my ($code,$msg) = $dnsdb->importAXFR($webvar{ifrom}, $domain, $webvar{group},
+        status => $webvar{domactive}, rwsoa => $webvar{rwsoa}, rwns => $webvar{rwns},
+        newttl => ($webvar{forcettl} ? $webvar{newttl} : 0),
+        merge => $webvar{mergematching});
       $row{domok} = $msg if $code eq 'OK';
       if ($code eq 'WARN') {
@@ -1632 +1629 @@
       goto DONELOG;
     }
-    $page->param(logfor => 'user '.userFullName($dbh,$id));
+    $page->param(logfor => 'user '.$dnsdb->userFullName($id));
   } elsif ($webvar{ltype} && $webvar{ltype} eq 'dom') {
     $id = $webvar{id};
@@ -1639 +1636 @@
       goto DONELOG;
     }
-    $page->param(logfor => 'domain '.domainName($dbh,$id));
+    $page->param(logfor => 'domain '.$dnsdb->domainName($id));
   } elsif ($webvar{ltype} && $webvar{ltype} eq 'rdns') {
     $id = $webvar{id};
@@ -1646 +1643 @@
       goto DONELOG;
     }
-    $page->param(logfor => 'reverse zone '.revName($dbh,$id));
+    $page->param(logfor => 'reverse zone '.$dnsdb->revName($id));
   } else {
     # Default to listing curgroup log
-    $page->param(logfor => 'group '.groupName($dbh,$id));
+    $page->param(logfor => 'group '.$dnsdb->groupName($id));
     # note that scope limitations are applied via the change-group check;
     # group log is always for the "current" group
   }
   $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);
@@ -1674 +1671 @@
   # Set up the column headings with the sort info
   my @cols = ('fname','username','entry','stamp');
-  my %colnames = (fname => 'Name', username => 'Username/Email', entry => 'Log Entry', stamp => 'Date/Time');
+  my %colnames = (fname => 'Name', username => 'Username', entry => 'Log Entry', stamp => 'Date/Time');
   fill_colheads($sortby, $sortorder, \@cols, \%colnames);
 
 ##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);
 
@@ -1704 +1701 @@
 
   $page->param(group => $curgroup);
-  $page->param(groupname => groupName($dbh,$curgroup));
-  $page->param(logingrp => groupName($dbh,$logingroup));
+  $page->param(groupname => $dnsdb->groupName($curgroup));
+  $page->param(logingrp => $dnsdb->groupName($logingroup));
   $page->param(logingrp_num => $logingroup);
 
@@ -1771 +1768 @@
 
   my $grptree = HTML::Template->new(filename => 'templates/grptree.tmpl');
-  getChildren($dbh,$root,\@childlist,'immediate');
+  $dnsdb->getChildren($root, \@childlist, 'immediate');
   return if $#childlist == -1;
   my @grouplist;
   foreach (@childlist) {
     my %row;
-    $row{grpname} = groupName($dbh,$_);
+    $row{grpname} = $dnsdb->groupName($_);
     $row{grpnum} = $_;
     $row{whereami} = $uri_self;
     $row{curgrp} = ($_ == $cur);
-    $row{expanded} = isParent($dbh, $_, 'group', $cur, 'group');
+    $row{expanded} = $dnsdb->isParent($_, 'group', $cur, 'group');
     $row{expanded} = 1 if $_ == $cur;
     $row{subs} = fill_grptree($_,$cur,$indent.'    ');
@@ -1810 +1807 @@
   my $newurl = "http://$ENV{HTTP_HOST}$ENV{SCRIPT_NAME}?sid=$sid";
   foreach (sort keys %params) {
+## fixme:  something is undefined here on add location
     $newurl .= "&$_=".$q->url_encode($params{$_});
   }
@@ -1851 +1849 @@
 #  $page->param(group   => $DNSDB::group);
   $page->param(isgrp => 1) if $defrec eq 'y';
-  $page->param(parent => ($defrec eq 'y' ? groupName($dbh, $id) :
-        ($revrec eq 'n' ? domainName($dbh, $id) : revName($dbh, $id)) ) );
+  $page->param(parent => ($defrec eq 'y' ? $dnsdb->groupName($id) :
+        ($revrec eq 'n' ? $dnsdb->domainName($id) : $dnsdb->revName($id)) ) );
 
 # defaults
@@ -1867 +1865 @@
   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}));
@@ -1893 +1891 @@
 
   # get the SOA first
-  my $soa = getSOA($dbh,$def,$rev,$id);
+  my $soa = $dnsdb->getSOA($def, $rev, $id);
 
   $page->param(contact  => $soa->{contact});
@@ -1903 +1901 @@
   $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) {
@@ -1922 +1920 @@
 
 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
@@ -1930 +1928 @@
 # prefill <domain> or DOMAIN in "Host" space for new records
   if ($webvar{revrec} eq 'n') {
-    my $domroot = ($webvar{defrec} eq 'y' ? 'DOMAIN' : domainName($dbh,$webvar{parentid}));
+    my $domroot = ($webvar{defrec} eq 'y' ? 'DOMAIN' : $dnsdb->domainName($webvar{parentid}));
     $page->param(name   => ($webvar{name} ? $webvar{name} : $domroot));
     $page->param(address        => $webvar{address});
@@ -1938 +1936 @@
     $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' : revName($dbh,$webvar{parentid}));
+    my $zname = ($webvar{defrec} eq 'y' ? 'ZONE' : $dnsdb->revName($webvar{parentid}));
     $zname =~ s|\d*/\d+$||;
     $page->param(address        => ($webvar{address} ? $webvar{address} : $zname));
   }
 # 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}));
 }
@@ -1969 +1967 @@
   local $webvar{clonesrc} = 0 if !defined($webvar{clonesrc});
 
-  my $clones = getUserDropdown($dbh, $curgroup, $webvar{clonesrc});
+  my $clones = $dnsdb->getUserDropdown($curgroup, $webvar{clonesrc});
   $page->param(clonesrc => $clones);
 }
@@ -2036 +2034 @@
 
   my @childgroups;
-  getChildren($dbh, $curgroup, \@childgroups, 'all') if $searchsubs;
+  $dnsdb->getChildren($curgroup, \@childgroups, 'all') if $searchsubs;
   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
-  fill_pgcount($count,($webvar{revrec} eq 'n' ? 'domains' : 'revzones'),groupName($dbh,$curgroup));
+  fill_pgcount($count,($webvar{revrec} eq 'n' ? 'domains' : 'revzones'),$dnsdb->groupName($curgroup));
   fill_fpnla($count);
 
@@ -2071 +2069 @@
   $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) {
@@ -2094 +2091 @@
 
   my @childgroups;
-  getChildren($dbh, $curgroup, \@childgroups, 'all') if $searchsubs;
+  $dnsdb->getChildren($curgroup, \@childgroups, 'all') if $searchsubs;
   my $childlist = join(',',@childgroups);
 
-  my ($count) = getGroupCount($dbh, (childlist => $childlist, curgroup => $curgroup,
-        filter => ($filter ? $filter : undef), startwith => ($startwith ? $startwith : undef) ) );
+  my ($count) = $dnsdb->getGroupCount(childlist => $childlist, curgroup => $curgroup,
+        filter => ($filter ? $filter : undef), startwith => ($startwith ? $startwith : undef) );
 
 # fill page count and first-previous-next-last-all bits
@@ -2129 +2126 @@
   $sortby = 'g2.group_name' if $sortby eq 'parent';
 
-  my $glist = getGroupList($dbh, (childlist => $childlist, curgroup => $curgroup,
+  my $glist = $dnsdb->getGroupList(childlist => $childlist, curgroup => $curgroup,
         filter => ($filter ? $filter : undef), startwith => ($startwith ? $startwith : undef),
-        offset => $webvar{offset}, sortby => $sortby, sortorder => $sortorder) );
+        offset => $webvar{offset}, sortby => $sortby, sortorder => $sortorder);
 
   $page->param(grouptable => $glist);
@@ -2149 +2146 @@
 
     my @childlist;
-    getChildren($dbh,$root,\@childlist,'immediate');
+    $dnsdb->getChildren($root, \@childlist, 'immediate');
     return if $#childlist == -1;
     foreach (@childlist) {
@@ -2155 +2152 @@
       $row{groupval} = $_;
       $row{groupactive} = ($_ == $cur);
-      $row{groupname} = $indent.groupName($dbh, $_);
+      $row{groupname} = $indent.$dnsdb->groupName($_);
       push @{$grplist}, \%row;
       getgroupdrop($_, $cur, $grplist, $indent.'&nbsp;&nbsp;&nbsp;&nbsp;');
@@ -2163 +2160 @@
   my @grouplist;
   push @grouplist, { groupval => $logingroup, groupactive => $logingroup == $curgroup,
-        groupname => groupName($dbh, $logingroup) };
+        groupname => $dnsdb->groupName($logingroup) };
   getgroupdrop($logingroup, $curgroup, \@grouplist);
 
@@ -2179 +2176 @@
 
   if ($permissions{admin} || $permissions{record_locchg}) {
-    my $loclist = getLocDropdown($dbh, $cur, $defloc);
+    my $loclist = $dnsdb->getLocDropdown($cur, $defloc);
     $page->param(record_locchg => 1);
     $page->param(loclist => $loclist);
   } else {
-    my $loc = getLoc($dbh, $defloc);
+    my $loc = $dnsdb->getLoc($defloc);
     $page->param(loc_name => $loc->{description});
   }
@@ -2192 +2189 @@
 
   my @childgroups;
-  getChildren($dbh, $curgroup, \@childgroups, 'all') if $searchsubs;
+  $dnsdb->getChildren($curgroup, \@childgroups, 'all') if $searchsubs;
   my $childlist = join(',',@childgroups);
 
-  my $count = getUserCount($dbh, (childlist => $childlist, curgroup => $curgroup,
-        filter => ($filter ? $filter : undef), startwith => ($startwith ? $startwith : undef) ) );
+  my $count = $dnsdb->getUserCount(childlist => $childlist, curgroup => $curgroup,
+        filter => ($filter ? $filter : undef), startwith => ($startwith ? $startwith : undef) );
 
 # fill page count and first-previous-next-last-all bits
@@ -2221 +2218 @@
   $page->param(searchsubs => $searchsubs) if $searchsubs;
 
-  my $ulist = getUserList($dbh, (childlist => $childlist, curgroup => $curgroup,
+  my $ulist = $dnsdb->getUserList(childlist => $childlist, curgroup => $curgroup,
         filter => ($filter ? $filter : undef), startwith => ($startwith ? $startwith : undef),
-        offset => $webvar{offset}, sortby => $sortby, sortorder => $sortorder) );
+        offset => $webvar{offset}, sortby => $sortby, sortorder => $sortorder);
   # Some UI things need to be done to the list (unlike other lists)
   foreach my $u (@{$ulist}) {
@@ -2239 +2236 @@
 
   my @childgroups;
-  getChildren($dbh, $curgroup, \@childgroups, 'all') if $searchsubs;
+  $dnsdb->getChildren($curgroup, \@childgroups, 'all') if $searchsubs;
   my $childlist = join(',',@childgroups);
 
-  my $count = getLocCount($dbh, (childlist => $childlist, curgroup => $curgroup,
-        filter => ($filter ? $filter : undef), startwith => ($startwith ? $startwith : undef) ) );
+  my $count = $dnsdb->getLocCount(childlist => $childlist, curgroup => $curgroup,
+        filter => ($filter ? $filter : undef), startwith => ($startwith ? $startwith : undef) );
 
 # fill page count and first-previous-next-last-all bits
@@ -2268 +2265 @@
   $page->param(searchsubs => $searchsubs) if $searchsubs;
 
-  my $loclist = getLocList($dbh, (childlist => $childlist, curgroup => $curgroup,
+  my $loclist = $dnsdb->getLocList(childlist => $childlist, curgroup => $curgroup,
         filter => ($filter ? $filter : undef), startwith => ($startwith ? $startwith : undef),
-        offset => $webvar{offset}, sortby => $sortby, sortorder => $sortorder) );
+        offset => $webvar{offset}, sortby => $sortby, sortorder => $sortorder);
   # Some UI things need to be done to the list
   foreach my $l (@{$loclist}) {
@@ -2341 +2338 @@
   } else {
     foreach (@viewablegroups) {
-      return 1 if isParent($dbh, $_, 'group', $entity, $entype);
+      return 1 if $dnsdb->isParent($_, 'group', $entity, $entype);
     }
   }

branches/stable/dns.sql

@@ -177 +177 @@
 COPY rectypes (val, name, stdflag, listorder, alphaorder) FROM stdin;
 1       A       1       1       1
-2       NS      2       9       37
+2       NS      2       10      37
 3       MD      5       255     29
 4       MF      5       255     30
-5       CNAME   2       11      9
+5       CNAME   2       12      9
 6       SOA     0       0       53
 7       MB      5       255     28
@@ -190 +190 @@
 13      HINFO   5       255     18
 14      MINFO   5       255     32
-15      MX      1       10      34
-16      TXT     2       12      60
+15      MX      1       11      34
+16      TXT     2       13      60
 17      RP      4       255     48
 18      AFSDB   5       255     4
@@ -208 +208 @@
 31      EID     5       255     15
 32      NIMLOC  5       255     36
-33      SRV     1       13      55
+33      SRV     1       14      55
 34      ATMA    5       255     6
 35      NAPTR   5       255     35
@@ -249 +249 @@
 65282   PTR template    3       6       2
 65283   A+PTR template  2       7       2
-65284   AAAA+PTR template       8       13      2
-65285   Delegation      2       8       2
+65284   AAAA+PTR template       2       8       2
+65285   Delegation      2       9       2
 \.
 

branches/stable/export.pl

@@ -25 +25 @@
 use lib '.';    ##uselib##
 
-use DNSDB qw(:ALL);
+use DNSDB;
 
-loadConfig();
+my $dnsdb = new DNSDB;
 
 open TINYDATA, ">tinydata";
 
-my ($dbh,$msg) = connectDB($config{dbname}, $config{dbuser}, $config{dbpass}, $config{dbhost});
-initGlobals($dbh);
-
-export($dbh,'tiny',*TINYDATA);
+$dnsdb->export('tiny', *TINYDATA);

branches/stable/templates/bulkdomain.tmpl

@@ -40 +40 @@
 <table>
 <tr>
-<TMPL_LOOP NAME=domtable><td><input type="checkbox" name="dom_<TMPL_VAR NAME=domainid>" value="<TMPL_VAR NAME=domainid>" /> <TMPL_VAR NAME=domain></td>
+<TMPL_LOOP NAME=domtable><td><input type="checkbox" name="dom_<TMPL_VAR NAME=domain_id>" value="<TMPL_VAR NAME=domain_id>" /> <TMPL_VAR NAME=domain></td>
 <TMPL_IF newrow></tr>
 <tr>

branches/stable/templates/newrevzone.tmpl

@@ -28 +28 @@
         </tr>
         <tr class="datalinelight">
+                <td>Default location/view:</td>
+                <td align="left">
+                        <select name="location">
+                        <TMPL_LOOP loclist>
+                        <option value="<TMPL_VAR NAME=loc>"<TMPL_IF selected> selected</TMPL_IF>><TMPL_VAR NAME=locname></option>
+                        </TMPL_LOOP>
+                        </select>
+                </td>
+        </tr>
+        <tr class="datalinelight">
                 <td>Add reverse zone to group:</td>
                 <td><select name="group">

branches/stable/textrecs.cgi

@@ -31 +31 @@
 use lib '.';    ##uselib##
 
-use DNSDB qw(:ALL);
+use DNSDB;
 
 # Let's do these templates right...
@@ -48 +48 @@
 #$webvar{revrec} = 'n' if !$webvar{revrec};     # non-reverse (domain) records
 
-# load some local system defaults (mainly DB connect info)
-# note this is not *absolutely* fatal, since there's a default dbname/user/pass in DNSDB.pm
-# we'll catch a bad DB connect string once we get to trying that
-##fixme:  pass params to loadConfig, and use them there, to allow one codebase to support multiple sites
-if (!loadConfig()) {
-  warn "Using default configuration;  unable to load custom settings: $DNSDB::errstr";
-}
+my $dnsdb = new DNSDB;
 
 # Check the session and if we have a zone ID to retrieve.  Call a failure sub if not.
 my $sid = ($webvar{sid} ? $webvar{sid} : undef);
-my $session = new CGI::Session("driver:File", $sid, {Directory => $config{sessiondir}})
+my $session = new CGI::Session("driver:File", $sid, {Directory => $dnsdb->{sessiondir}})
         or die CGI::Session->errstr();
 do_not_pass_go() if !$sid;
 do_not_pass_go() if !$webvar{id};
 
-##fixme: quit throwing the database handle around, and put all the SQL and direct DB fiddling into DNSDB.pm
-# dbname, user, pass, host (optional)
-my ($dbh,$msg) = connectDB($config{dbname}, $config{dbuser}, $config{dbpass}, $config{dbhost});
-# Load config pieces from the database.  Ideally all but the DB user/pass/etc should be loaded here.
-initGlobals($dbh);
-
 my $zone;
-$zone = domainName($dbh, $webvar{id}) if $webvar{defrec} eq 'n';
-$zone = "group ".groupName($dbh, $webvar{id}) if $webvar{defrec} eq 'y';
+$zone = ($webvar{revrec} eq 'n' ? $dnsdb->domainName($webvar{id}) : $dnsdb->revName($webvar{id}))
+        if $webvar{defrec} eq 'n';
+$zone = "group ".$dnsdb->groupName($webvar{id}) if $webvar{defrec} eq 'y';
 
 ##fixme:  do we support both HTML-plain and true plaintext?  could be done, with another $webvar{}
@@ -84 +73 @@
 print qq(Press the "Back" button to return to the standard record list.\n\n);
 
-my $reclist = getDomRecs($dbh, $webvar{defrec}, $webvar{id}, 0, 'all', 'type,host', 'ASC');
-
+my $reclist = $dnsdb->getDomRecs(defrec => $webvar{defrec}, revrec => $webvar{revrec}, id => $webvar{id},
+        sortby => ($webvar{revrec} eq 'n' ? 'type,host' : 'type,val'), sortorder => 'ASC');
 foreach my $rec (@$reclist) {
   $rec->{type} = $typemap{$rec->{type}};

branches/stable/tiny-import.pl

@@ -27 +27 @@
 
 use lib '.';
-use DNSDB qw(:ALL);
-
-if (!loadConfig()) {
-  warn "Using default configuration;  unable to load custom settings: $DNSDB::errstr";
-}
+use DNSDB;
+
+my $dnsdb = new DNSDB;
 
 usage() if !@ARGV;
@@ -77 +75 @@
 
 my $code;
-my ($dbh,$msg) = connectDB($config{dbname}, $config{dbuser}, $config{dbpass}, $config{dbhost});
-initGlobals($dbh) if $dbh;
+my $dbh = $dnsdb->{dbh};
 
 $dbh->{AutoCommit} = 0;
@@ -85 +82 @@
 my %cnt;
 my @deferred;
+my $converted = 0;
 my $errstr = '';
 
@@ -167 +165 @@
 
   # .. but we can at least say how many records weren't imported.
-  print "$ok OK, ".scalar(@deferred)." deferred records in $flatfile\n";
-  $#deferred = -1;
-
+  print "$ok OK, ".scalar(@deferred)." deferred, $converted downconverted records in $flatfile\n";
+  undef @deferred;
+  $converted = 0;
 
   # Sub for various nonstandard types with lots of pure bytes expressed in octal
@@ -250 +248 @@
     my $nodefer = shift || 0;
     my $impok = 1;
+    my $msg;
 
     $errstr = $rec;  # this way at least we have some idea what went <splat>
@@ -268 +267 @@
       $loc = '' if !$loc;
       $loc = '' if $loc =~ /^:+$/;
-      my $fparent = DNSDB::_hostparent($dbh, $host);
+      my $fparent = $dnsdb->_hostparent($host);
       my ($rparent) = $dbh->selectrow_array("SELECT rdns_id FROM revzones WHERE revnet >> ?", undef, ($ip));
       if ($fparent && $rparent) {
         $recsth->execute($fparent, $rparent, $host, 65280, $ip, 0, 0, 0, $ttl, $loc);
       } else {
-        push @deferred, $rec unless $nodefer;
-        $impok = 0;
-        #  print "$tmporig deferred;  can't find both forward and reverse zone parents\n";
+        if ($importcfg{conv}) {
+          # downconvert A+PTR if forward zone is not found
+          $recsth->execute(0, $rparent, $host, 12, $ip, 0, 0, 0, $ttl, $loc);
+          $converted++;
+        } else {
+          push @deferred, $rec unless $nodefer;
+          $impok = 0;
+          #  print "$tmporig deferred;  can't find both forward and reverse zone parents\n";
+        }
       }
 
@@ -301 +306 @@
 
       } else {
-        my $fparent = DNSDB::_hostparent($dbh, $host);
+        my $fparent = $dnsdb->_hostparent($host);
         if ($fparent) {
           $recsth->execute($fparent, 0, $host, 5, $targ, 0, 0, 0, $ttl, $loc);
@@ -337 +342 @@
         }
       } else {
-        my $fparent = DNSDB::_hostparent($dbh, $zone);
+        my $fparent = $dnsdb->_hostparent($zone);
         if ($fparent) {
           $recsth->execute($fparent, 0, $zone, 2, $ns, 0, 0, 0, $ttl, $loc);
@@ -389 +394 @@
       $loc = '' if $loc =~ /^:+$/;
 
-      my $domid = DNSDB::_hostparent($dbh, $host);
+      my $domid = $dnsdb->_hostparent($host);
       if ($domid) {
         $recsth->execute($domid, 0, $host, 1, $ip, 0, 0, 0, $ttl, $loc);
@@ -440 +445 @@
 
       # allow for subzone MXes, since it's perfectly legitimate to simply stuff it all in a single parent zone
-      my $domid = DNSDB::_hostparent($dbh, $zone);
+      my $domid = $dnsdb->_hostparent($zone);
       if ($domid) {
         $recsth->execute($domid, 0, $zone, 15, $host, $dist, 0, 0, $ttl, $loc);
@@ -466 +471 @@
         $recsth->execute(0, $rparent, $rdata, 16, "$msg", 0, 0, 0, $ttl, $loc);
       } else {
-        my $domid = DNSDB::_hostparent($dbh, $fqdn);
+        my $domid = $dnsdb->_hostparent($fqdn);
         if ($domid) {
           $recsth->execute($domid, 0, $fqdn, 16, $rdata, 0, 0, 0, $ttl, $loc);
@@ -581 +586 @@
 #  }
 
-        my $domid = DNSDB::_hostparent($dbh, $fqdn);
+        my $domid = $dnsdb->_hostparent($fqdn);
         if ($domid) {
           $recsth->execute($domid, 0, $fqdn, 33, $target, $prio, $weight, $port, $ttl, $loc) if $domid;
@@ -599 +604 @@
         my $val = NetAddr::IP->new(join(':', @v6));
 
-        my $fparent = DNSDB::_hostparent($dbh, $fqdn);
+        my $fparent = $dnsdb->_hostparent($fqdn);
         if ($fparent) {
           $recsth->execute($fparent, 0, $fqdn, 28, $val->addr, 0, 0, 0, $ttl, $loc);
@@ -621 +626 @@
           }
         } else {
-          my $domid = DNSDB::_hostparent($dbh, $fqdn);
+          my $domid = $dnsdb->_hostparent($fqdn);
           if ($domid) {
             $recsth->execute($domid, 0, $fqdn, 16, $txtstring, 0, 0, 0, $ttl, $loc);
@@ -649 +654 @@
           }
         } else {
-          my $domid = DNSDB::_hostparent($dbh, $fqdn);
+          my $domid = $dnsdb->_hostparent($fqdn);
           if ($domid) {
             $recsth->execute($domid, 0, $fqdn, 17, "$email $txtrec", 0, 0, 0, $ttl, $loc);
@@ -665 +670 @@
 
         # these do not make sense in a reverse zone, since they're logically attached to an A record
-        my $domid = DNSDB::_hostparent($dbh, $fqdn);
+        my $domid = $dnsdb->_hostparent($fqdn);
         if ($domid) {
           $recsth->execute($domid, 0, $fqdn, 44, $sshfp, 0, 0, 0, $ttl, $loc);

branches/stable/vega-import.pl

@@ -29 +29 @@
 use Data::Dumper;
 
-use DNSDB qw(:ALL);
-
-if (!loadConfig()) {
-  warn "Using default configuration;  unable to load custom settings: $DNSDB::errstr";
-}
+use DNSDB;
+
+my $dnsdb = new DNSDB;
 
 my $mode = 'add';
@@ -45 +43 @@
 $mode = $ARGV[0] if $ARGV[0];
 
-my ($newdbh,$msg) = connectDB($config{dbname}, $config{dbuser}, $config{dbpass}, $config{dbhost});
+my $newdbh = $dnsdb->{dbh};
 $newdbh->{PrintError} = 1;
 $newdbh->{PrintWarn} = 1;
-initGlobals($newdbh);
 
 my %vegatypes = ('S' => 'SOA', 'N' => 'NS', 'A' => 'A', 'T' => 'TXT',