Changeset 548 for branches/stable/DNSDB.pm

Timestamp:

12/11/13 16:01:18 (10 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge reverse DNS work and object conversion from /trunk, part 5

Includes changes through r543 with a few more minor conflicts.

Location:

branches/stable

Files:

• . (modified) (1 prop)
• DNSDB.pm (modified) (90 diffs)

branches/stable/DNSDB.pm

@@ -3 +3 @@
 ##
 # $Id$
-# Copyright 2008-2012 Kris Deugau <kdeugau@deepnet.cx>
+# Copyright 2008-2013 Kris Deugau <kdeugau@deepnet.cx>
 # 
 #    This program is free software: you can redistribute it and/or modify
@@ -28 +28 @@
 use Crypt::PasswdMD5;
 use Net::SMTP;
-use NetAddr::IP qw(:lower);
+use NetAddr::IP 4.027 qw(:lower);
 use POSIX;
 use Fcntl qw(:flock);
+use Time::TAI64 qw(:tai64);
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
@@ -40 +41 @@
         &getPermissions &changePermissions &comparePermissions
         &changeGroup
-        &loadConfig &connectDB &finish
+        &connectDB &finish
         &addDomain &delZone &domainName &revName &domainID &revID &addRDNS
         &getZoneCount &getZoneList &getZoneLocation
@@ -49 +50 @@
         &addLoc &updateLoc &delLoc &getLoc
         &getLocCount &getLocList &getLocDropdown
-        &getSOA &updateSOA &getRecLine &getDomRecs &getRecCount
+        &getSOA &updateSOA &getRecLine &getRecList &getRecCount
         &addRec &updateRec &delRec
         &getLogCount &getLogEntries
@@ -59 +60 @@
         &export
         &mailNotify
-        %typemap %reverse_typemap %config
+        %typemap %reverse_typemap
         @permtypes $permlist %permchains
         );
@@ -68 +69 @@
                 &getPermissions &changePermissions &comparePermissions
                 &changeGroup
-                &loadConfig &connectDB &finish
+                &connectDB &finish
                 &addDomain &delZone &domainName &revName &domainID &revID &addRDNS
                 &getZoneCount &getZoneList &getZoneLocation
@@ -77 +78 @@
                 &addLoc &updateLoc &delLoc &getLoc
                 &getLocCount &getLocList &getLocDropdown
-                &getSOA &updateSOA &getRecLine &getDomRecs &getRecCount
+                &getSOA &updateSOA &getRecLine &getRecList &getRecCount
                 &addRec &updateRec &delRec
                 &getLogCount &getLogEntries
@@ -87 +88 @@
                 &export
                 &mailNotify
-                %typemap %reverse_typemap %config
+                %typemap %reverse_typemap
                 @permtypes $permlist %permchains
                 )]
@@ -94 +95 @@
 our $errstr = '';
 our $resultstr = '';
-
-# Halfway sane defaults for SOA, TTL, etc.
-# serial defaults to 0 for convenience.
-# value will be either YYYYMMDDNN for BIND/etc, or auto-internal for tinydns
-our %def = qw (
-        contact hostmaster.DOMAIN
-        prins   ns1.myserver.com
-        serial  0
-        soattl  86400
-        refresh 10800
-        retry   3600
-        expire  604800
-        minttl  10800
-        ttl     10800
-);
 
 # Arguably defined wholly in the db, but little reason to change without supporting code changes
@@ -135 +121 @@
 our %typemap;
 our %reverse_typemap;
-
-# Prepopulate a basic config.  Note some of these *will* cause errors if left unset.
-# note:  add appropriate stanzas in loadConfig to parse these
-our %config = (
-                # Database connection info
-                dbname  => 'dnsdb',
-                dbuser  => 'dnsdb',
-                dbpass  => 'secret',
-                dbhost  => '',
-
-                # Email notice settings
-                mailhost        => 'smtp.example.com',
-                mailnotify      => 'dnsdb@example.com', # to
-                mailsender      => 'dnsdb@example.com', # from
-                mailname        => 'DNS Administration',
-                orgname         => 'Example Corp',
-                domain          => 'example.com',
-
-                # Template directory
-                templatedir     => 'templates/',
-# fmeh.  this is a real web path, not a logical internal one.  hm..
-#               cssdir  => 'templates/',
-                sessiondir      => 'session/',
-                exportcache     => 'cache/',
-
-                # Session params
-                timeout         => '3600',      # 1 hour default
-
-                # Other miscellanea
-                log_failures    => 1,   # log all evarthing by default
-                perpage         => 15,
-                maxfcgi         => 100, # reasonable default?
-        );
 
 ## (Semi)private variables
@@ -221 +174 @@
   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};
+
+  # Prepopulate a basic config.  Note some of these *will* cause errors if left unset.
+  # note:  add appropriate stanzas in __cfgload() to parse these
+  my %defconfig = (
+                # The only configuration options not loadable from a config file.
+                configfile => "/etc/dnsdb/dnsdb.conf",  ##CFG_LEAF##
+
+                # Database connection info
+                dbname  => 'dnsdb',
+                dbuser  => 'dnsdb',
+                dbpass  => 'secret',
+                dbhost  => '',
+
+                # Email notice settings
+                mailhost        => 'smtp.example.com',
+                mailnotify      => 'dnsdb@example.com', # to
+                mailsender      => 'dnsdb@example.com', # from
+                mailname        => 'DNS Administration',
+                orgname         => 'Example Corp',
+                domain          => 'example.com',
+
+                # Template directory
+                templatedir     => 'templates/',
+# fmeh.  this is a real web path, not a logical internal one.  hm..
+#               cssdir  => 'templates/',
+                sessiondir      => 'session/',
+                exportcache     => 'cache/',
+
+                # Session params
+                timeout         => '1h',        # passed as-is to CGI::Session
+
+                # Other miscellanea
+                log_failures    => 1,   # log all evarthing by default
+                perpage         => 15,
+                max_fcgi_requests => 100,       # reasonable default?
+                force_refresh   => 1,
+                lowercase       => 0,   # mangle as little as possible by default
+        );
+
+  # Config file parse calls.
+  # If we are passed a blank argument for $args{configfile},
+  #   we should NOT parse the default config file - we will
+  #   rely on hardcoded defaults OR caller-specified values.
+  # If we are passed a non-blank argument, parse that file.
+  # If no config file is specified, parse the default one.
+  my %siteconfig;
+  if (defined($args{configfile})) {
+    if ($args{configfile}) {
+      return if !__cfgload($args{configfile}, \%siteconfig);
+    }
+  } else {
+    return if !__cfgload($defconfig{configfile}, \%siteconfig);
+  }
+
+  # Assemble the object.  Apply configuration hashes in order of precedence.
+  my $self = {
+        # Hardcoded defaults
+        %defconfig,
+        # Default config file OR caller-specified one, loaded above
+        %siteconfig,
+        # Caller-specified arguments
+        %args
+        };
   bless $self, $class;
+
+  # Several settings are booleans.  Handle multiple possible ways of setting them.
+  for my $boolopt ('log_failures', 'force_refresh', 'lowercase') {
+    if ($self->{$boolopt} ne '1' && $self->{$boolopt} ne '0') {
+      # true/false, on/off, yes/no all valid.
+      if ($self->{$boolopt} =~ /^(?:true|false|t|f|on|off|yes|no)$/) {
+        if ($self->{$boolopt} =~ /(?:true|t|on|yes)/) {
+         $self->{$boolopt} = 1;
+        } else {
+         $self->{$boolopt} = 0;
+        }
+      } else {
+        warn "Bad $boolopt setting $self->{$boolopt}\n";
+        $self->{$boolopt} = 1;
+      }
+    }
+  }
+
+  # Try to connect to the DB, and initialize a number of handy globals.
   $self->{dbh} = connectDB($self->{dbname}, $self->{dbuser}, $self->{dbpass}, $self->{dbhost}) or return;
   $self->initGlobals();
@@ -236 +265 @@
 sub DESTROY {
   my $self = shift;
-  $self->{dbh}->disconnect;
+  $self->{dbh}->disconnect if $self->{dbh};
 }
+
+sub errstr { $DNSDB::errstr; }
 
 ##
@@ -370 +401 @@
 
 ##fixme:  farm out the actual logging to different subs for file, syslog, internal, etc based on config
-#  if ($config{log_channel} eq 'sql') {
+#  if ($self->{log_channel} eq 'sql') {
   $dbh->do("INSERT INTO log (domain_id,rdns_id,group_id,entry,user_id,email,name) VALUES (?,?,?,?,?,?,?)",
         undef,
         ($args{domain_id}, $args{rdns_id}, $args{group_id}, $args{entry},
                 $self->{loguserid}, $self->{logusername}, $self->{logfullname}) );
-#  } elsif ($config{log_channel} eq 'file') {
-#  } elsif ($config{log_channel} eq 'syslog') {
+#  } elsif ($self->{log_channel} eq 'file') {
+#  } elsif ($self->{log_channel} eq 'syslog') {
 #  }
 } # end _log
@@ -409 +440 @@
   # or the intended parent domain for live records.
   my $pname = ($args{defrec} eq 'y' ? 'DOMAIN' : $self->domainName($args{id}));
-  ${$args{host}} =~ s/\.*$/\.$pname/ if ${$args{host}} !~ /$pname$/;
+  ${$args{host}} =~ s/\.*$/\.$pname/ if (${$args{host}} ne '@' && ${$args{host}} !~ /$pname$/);
 
   # Check IP is well-formed, and that it's a v4 address
@@ -526 +557 @@
         ${$args{val}} = "ZONE,${$args{val}}" unless ${$args{val}} =~ /^ZONE/;
       }
-      ${$args{host}} =~ s/\.*$/\.$config{domain}/ if ${$args{host}} !~ /(?:$config{domain}|ADMINDOMAIN)$/;
+      ${$args{host}} =~ s/\.*$/\.$self->{domain}/ if ${$args{host}} !~ /(?:$self->{domain}|ADMINDOMAIN)$/;
     }
 
@@ -1202 +1233 @@
   #major patterns:
   #dashed IP, forward and reverse
+  #underscoreed IP, forward and reverse
   #dotted IP, forward and reverse (even if forward is... dumb)
-  # -> %r for reverse, %i for forward, leading - or . to indicate separator, defaults to -
+  # -> %r for reverse, %i for forward, leading -, _, or . to indicate separator, defaults to -
   # %r or %-r   => %4d-%3d-%2d-%1d
+  # %_r         => %4d_%3d_%2d_%1d
   # %.r         => %4d.%3d.%2d.%1d
   # %i or %-i   => %1d-%2d-%3d-%4d
+  # %_i         => %1d_%2d_%3d_%4d
   # %.i         => %1d.%2d.%3d.%4d
   $$tmpl =~ s/\%r/\%4d-\%3d-\%2d-\%1d/g;
-  $$tmpl =~ s/\%([-.])r/\%4d$1\%3d$1\%2d$1\%1d/g;
+  $$tmpl =~ s/\%([-._])r/\%4d$1\%3d$1\%2d$1\%1d/g;
   $$tmpl =~ s/\%i/\%1d-\%2d-\%3d-\%4d/g;
-  $$tmpl =~ s/\%([-.])i/\%1d$1\%2d$1\%3d$1\%4d/g;
+  $$tmpl =~ s/\%([-._])i/\%1d$1\%2d$1\%3d$1\%4d/g;
 
   #hex-coded IP
@@ -1232 +1266 @@
 } # _template4_expand()
 
+# Broad syntactic check on the hostname.  Checks for valid characters, correctly-expandable template patterns.
+# Takes the hostname, type, and live/default and forward/reverse flags
+# Returns true/false, sets errstr on failures
+sub _check_hostname_form {
+  my ($hname,$rectype,$defrec,$revrec) = @_;
+
+  if ($hname =~ /\%/ && ($rectype == 65282 || $rectype == 65283) ) {
+    my $tmphost = $hname;
+    # we don't actually need to test with the real IP passed;  that saves a bit of fiddling.
+    _template4_expand(\$tmphost, '10.10.10.10');
+    if ($tmphost =~ /\%/) {
+      $errstr = "Invalid template $hname";
+      return;
+    }
+  } elsif ($revrec eq 'y') {
+    # Reverse zones don't support @ in hostnames
+    # Also skip failure on revzone TXT records;  the hostname contains the TXT content in that case.
+    if ($rectype != $reverse_typemap{TXT} && lc($hname) !~ /^[0-9a-z_.-]+$/) {
+      $errstr = "Hostnames may not contain anything other than (0-9 a-z . _)";
+      return;
+    }
+  } else {
+    if (lc($hname) !~ /^(?:[0-9a-z_.-]+|@)$/) {
+      # Don't mention @, because it would be far too wordy to explain the nuance of @
+      $errstr = "Hostnames may not contain anything other than (0-9 a-z . _)";
+      return;
+    }
+  }
+  return 1;
+} # _check_hostname_form()
+
 
 ##
@@ -1237 +1302 @@
 ##
 
-## DNSDB::loadConfig()
-# Load the minimum required initial state (DB connect info) from a config file
-# Load misc other bits while we're at it.
-# Takes an optional hash that may contain:
-#  - basename and config path to look for
-# Populates the %config and %def hashes
-sub loadConfig {
-  my %args = @_;
-  $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{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{configfile}";
-
-  # System defaults
-  __cfgload("$defconfig") or $deferr = $errstr;
-
-  # Per-site-ish settings.
-  if ($args{configfile} ne '.conf') {
-    unless (__cfgload("$siteconfig")) {
-      $errstr = ($deferr ? "Error opening default config file $defconfig: $deferr\n" : '').
-        "Error opening site config file $siteconfig";
-      return;
-    }
-  }
-
-  # Munge log_failures.
-  if ($config{log_failures} ne '1' && $config{log_failures} ne '0') {
-    # true/false, on/off, yes/no all valid.
-    if ($config{log_failures} =~ /^(?:true|false|on|off|yes|no)$/) {
-      if ($config{log_failures} =~ /(?:true|on|yes)/) {
-        $config{log_failures} = 1;
-      } else {
-        $config{log_failures} = 0;
-      }
-    } else {
-      $errstr = "Bad log_failures setting $config{log_failures}";
-      $config{log_failures} = 1;
-      # Bad setting shouldn't be fatal.
-      # return 2;
-    }
-  }
-
-  # All good, clear the error and go home.
-  $errstr = '';
-  return 1;
-} # end loadConfig()
-
-
 ## DNSDB::__cfgload()
 # Private sub to parse a config file and load it into %config
-# Takes a filename
+# Takes a filename and a hashref to put the parsed entries in
 sub __cfgload {
   $errstr = '';
   my $cfgfile = shift;
+  my $cfg = shift;
 
   if (open CFG, "<$cfgfile") {
@@ -1310 +1319 @@
 #    $mode = $1 if /^\[(a-z)+]/;
     # DB connect info
-      $config{dbname}   = $1 if /^dbname\s*=\s*([a-z0-9_.-]+)/i;
-      $config{dbuser}   = $1 if /^dbuser\s*=\s*([a-z0-9_.-]+)/i;
-      $config{dbpass}   = $1 if /^dbpass\s*=\s*([a-z0-9_.-]+)/i;
-      $config{dbhost}   = $1 if /^dbhost\s*=\s*([a-z0-9_.-]+)/i;
-      # SOA defaults
-      $def{contact}     = $1 if /^contact\s*=\s*([a-z0-9_.-]+)/i;
-      $def{prins}       = $1 if /^prins\s*=\s*([a-z0-9_.-]+)/i;
-      $def{soattl}      = $1 if /^soattl\s*=\s*(\d+)/i;
-      $def{refresh}     = $1 if /^refresh\s*=\s*(\d+)/i;
-      $def{retry}       = $1 if /^retry\s*=\s*(\d+)/i;
-      $def{expire}      = $1 if /^expire\s*=\s*(\d+)/i;
-      $def{minttl}      = $1 if /^minttl\s*=\s*(\d+)/i;
-      $def{ttl}         = $1 if /^ttl\s*=\s*(\d+)/i;
+      $cfg->{dbname}    = $1 if /^dbname\s*=\s*([a-z0-9_.-]+)/i;
+      $cfg->{dbuser}    = $1 if /^dbuser\s*=\s*([a-z0-9_.-]+)/i;
+      $cfg->{dbpass}    = $1 if /^dbpass\s*=\s*([a-z0-9_.-]+)/i;
+      $cfg->{dbhost}    = $1 if /^dbhost\s*=\s*([a-z0-9_.-]+)/i;
       # Mail settings
-      $config{mailhost}         = $1 if /^mailhost\s*=\s*([a-z0-9_.-]+)/i;
-      $config{mailnotify}       = $1 if /^mailnotify\s*=\s*([a-z0-9_.\@-]+)/i;
-      $config{mailsender}       = $1 if /^mailsender\s*=\s*([a-z0-9_.\@-]+)/i;
-      $config{mailname}         = $1 if /^mailname\s*=\s*([a-z0-9\s_.-]+)/i;
-      $config{orgname}          = $1 if /^orgname\s*=\s*([a-z0-9\s_.,'-]+)/i;
-      $config{domain}           = $1 if /^domain\s*=\s*([a-z0-9_.-]+)/i;
+      $cfg->{mailhost}          = $1 if /^mailhost\s*=\s*([a-z0-9_.-]+)/i;
+      $cfg->{mailnotify}        = $1 if /^mailnotify\s*=\s*([a-z0-9_.\@-]+)/i;
+      $cfg->{mailsender}        = $1 if /^mailsender\s*=\s*([a-z0-9_.\@-]+)/i;
+      $cfg->{mailname}          = $1 if /^mailname\s*=\s*([a-z0-9\s_.-]+)/i;
+      $cfg->{orgname}           = $1 if /^orgname\s*=\s*([a-z0-9\s_.,'-]+)/i;
+      $cfg->{domain}            = $1 if /^domain\s*=\s*([a-z0-9_.-]+)/i;
       # session - note this is fed directly to CGI::Session
-      $config{timeout}          = $1 if /^[tT][iI][mM][eE][oO][uU][tT]\s*=\s*(\d+[smhdwMy]?)/;
-      $config{sessiondir}       = $1 if m{^sessiondir\s*=\s*([a-z0-9/_.-]+)}i;
+      $cfg->{timeout}           = $1 if /^[tT][iI][mM][eE][oO][uU][tT]\s*=\s*(\d+[smhdwMy]?)/;
+      $cfg->{sessiondir}        = $1 if m{^sessiondir\s*=\s*([a-z0-9/_.-]+)}i;
       # misc
-      $config{log_failures}     = $1 if /^log_failures\s*=\s*([a-z01]+)/i;
-      $config{perpage}          = $1 if /^perpage\s*=\s*(\d+)/i;
-      $config{exportcache}      = $1 if m{^exportcache\s*=\s*([a-z0-9/_.-]+)}i;
+      $cfg->{log_failures}      = $1 if /^log_failures\s*=\s*([a-z01]+)/i;
+      $cfg->{perpage}           = $1 if /^perpage\s*=\s*(\d+)/i;
+      $cfg->{exportcache}       = $1 if m{^exportcache\s*=\s*([a-z0-9/_.-]+)}i;
+      $cfg->{lowercase}         = $1 if /^lowercase\s*=\s*([a-z01]+)/i;
+# not supported in dns.cgi yet
+#      $cfg->{templatedir}      = $1 if m{^templatedir\s*=\s*([a-z0-9/_.-]+)}i;
+#      $cfg->{templateoverride} = $1 if m{^templateoverride\s*=\s*([a-z0-9/_.-]+)}i;
       # RPC options
-      $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;
+      $cfg->{rpcmode}           = $1 if /^rpc_mode\s*=\s*(socket|HTTP|XMLRPC)\s*$/i;
+      $cfg->{maxfcgi}           = $1 if /^max_fcgi_requests\s*=\s*(\d+)\s*$/i;
+      $cfg->{force_refresh}     = $1 if /^force_refresh\s*=\s*([a-z01]+)/i;
       if (my ($tmp) = /^rpc_iplist\s*=\s*(.+)/i) {
         my @ips = split /[,\s]+/, $tmp;
         my $rpcsys = shift @ips;
-        push @{$config{rpcacl}{$rpcsys}}, @ips;
+        push @{$cfg->{rpcacl}{$rpcsys}}, @ips;
       }
     }
     close CFG;
   } else {
-    $errstr = $!;
+    $errstr = "Couldn't load configuration file $cfgfile: $!";
     return;
   }
@@ -1531 +1536 @@
 # about having to open a file or a syslog channel
 ##fixme Need to call _initActionLog_blah() for various logging channels, configured
-# via dnsdb.conf, in $config{log_channel} or something
+# via dnsdb.conf, in $self->{log_channel} or something
 # See https://secure.deepnet.cx/trac/dnsadmin/ticket/21
 sub initActionLog {
@@ -1552 +1557 @@
 
   # convert to real check once we have other logging channels
-  # if ($config{log_channel} eq 'sql') {
+  # if ($self->{log_channel} eq 'sql') {
   #   Open Log, Sez Me!
   # }
@@ -1594 +1599 @@
   my $sth = $dbh->prepare($sql);
 
-  $sth->execute($id) or die "argh: ".$sth->errstr;
+##fixme?  we don't trap other plain SELECT errors
+  $sth->execute($id);
 
 #  my $permref = $sth->fetchrow_hashref;
@@ -1778 +1784 @@
     my $msg = $@;
     eval { $dbh->rollback; };
-    if ($config{log_failures}) {
+    if ($self->{log_failures}) {
       $self->_log(group_id => $oldgid, entry => "Error moving $type $entname to $newgname: $msg");
       $dbh->commit;     # since we enabled transactions earlier
@@ -1802 +1808 @@
   my $self = shift;
   my $dbh = $self->{dbh};
-  return ('FAIL',"Need database handle") if !$dbh;
   my $domain = shift;
-  return ('FAIL',"Domain must not be blank") if !$domain;
+  return ('FAIL',"Domain must not be blank\n") if !$domain;
   my $group = shift;
-  return ('FAIL',"Need group") if !defined($group);
+  return ('FAIL',"Group must be specified\n") if !defined($group);
   my $state = shift;
-  return ('FAIL',"Need domain status") if !defined($state);
+  return ('FAIL',"Domain status must be specified\n") if !defined($state);
+  my $defloc = shift || '';
 
   $state = 1 if $state =~ /^active$/;
@@ -1817 +1823 @@
   return ('FAIL',"Invalid domain status") if $state !~ /^\d+$/;
 
+  $domain = lc($domain) if $self->{lowercase};
+
   return ('FAIL', "Invalid characters in domain") if $domain !~ /^[a-zA-Z0-9_.-]+$/;
 
@@ -1836 +1844 @@
   eval {
     # insert the domain...
-    $dbh->do("INSERT INTO domains (domain,group_id,status) VALUES (?,?,?)", undef, ($domain, $group, $state));
+    $dbh->do("INSERT INTO domains (domain,group_id,status,default_location) VALUES (?,?,?,?)", undef,
+        ($domain, $group, $state, $defloc));
 
     # get the ID...
@@ -1847 +1856 @@
     # ... and now we construct the standard records from the default set.  NB:  group should be variable.
     my $sth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl FROM default_records WHERE group_id=?");
-    my $sth_in = $dbh->prepare("INSERT INTO records (domain_id,host,type,val,distance,weight,port,ttl)".
-        " VALUES ($dom_id,?,?,?,?,?,?,?)");
+    my $sth_in = $dbh->prepare("INSERT INTO records (domain_id,host,type,val,distance,weight,port,ttl,location)".
+        " VALUES ($dom_id,?,?,?,?,?,?,?,?)");
     $sth->execute($group);
-    while (my ($host,$type,$val,$dist,$weight,$port,$ttl) = $sth->fetchrow_array()) {
+    while (my ($host, $type, $val, $dist, $weight, $port, $ttl) = $sth->fetchrow_array()) {
       $host =~ s/DOMAIN/$domain/g;
       $val =~ s/DOMAIN/$domain/g;
-      $sth_in->execute($host,$type,$val,$dist,$weight,$port,$ttl);
+      $sth_in->execute($host, $type, $val, $dist, $weight, $port, $ttl, $defloc);
       if ($typemap{$type} eq 'SOA') {
         my @tmp1 = split /:/, $host;
@@ -1877 +1886 @@
     eval { $dbh->rollback; };
     $self->_log(group_id => $group, entry => "Failed adding domain $domain ($msg)")
-        if $config{log_failures};
+        if $self->{log_failures};
     $dbh->commit;       # since we enabled transactions earlier
     return ('FAIL',$msg);
@@ -1908 +1917 @@
   return ('FAIL', ($revrec eq 'n' ? 'Domain' : 'Reverse zone')." ID $zoneid doesn't exist") if !$zone;
 
-  # Set this up here since we may use if if $config{log_failures} is enabled
+  # Set this up here since we may use if if $self->{log_failures} is enabled
   my %loghash;
   $loghash{domain_id} = $zoneid if $revrec eq 'n';
@@ -1956 +1965 @@
     eval { $dbh->rollback; };
     $loghash{entry} = "Error deleting $zone: $msg ($failmsg)";
-    if ($config{log_failures}) {
+    if ($self->{log_failures}) {
       $self->_log(%loghash);
       $dbh->commit;     # since we enabled transactions earlier
@@ -2008 +2017 @@
   my ($domid) = $dbh->selectrow_array("SELECT domain_id FROM domains WHERE lower(domain) = lower(?)",
         undef, ($domain) );
-  $errstr = $DBI::errstr if !$domid;
+  if (!$domid) {
+    if ($dbh->err) {
+      $errstr = $DBI::errstr;
+    } else {
+      $errstr = "Domain $domain not present";
+    }
+  }
   return $domid if $domid;
 } # end domainID()
@@ -2022 +2037 @@
   my $revzone = shift;
   my ($revid) = $dbh->selectrow_array("SELECT rdns_id FROM revzones WHERE revnet=?", undef, ($revzone) );
-  $errstr = $DBI::errstr if !$revid;
+  if (!$revid) {
+    if ($dbh->err) {
+      $errstr = $DBI::errstr;
+    } else {
+      $errstr = "Reverse zone $revzone not present";
+    }
+  }
   return $revid if $revid;
 } # end revID()
@@ -2089 +2110 @@
       }
 
-      $host =~ s/ADMINDOMAIN/$config{domain}/g;
+      $host =~ s/ADMINDOMAIN/$self->{domain}/g;
 
       # Check to make sure the IP stubs will fit in the zone.  Under most usage failures here should be rare.
@@ -2183 +2204 @@
     eval { $dbh->rollback; };
     $self->_log(group_id => $group, entry => "Failed adding reverse zone $zone ($msg)")
-        if $config{log_failures};
+        if $self->{log_failures};
     $dbh->commit;       # since we enabled transactions earlier
     return ('FAIL',$msg);
@@ -2211 +2232 @@
 
   my %args = @_;
+
+  # Fail on bad curgroup argument.  There's no sane fallback on this one.
+  if (!$args{curgroup} || $args{curgroup} !~ /^\d+$/) {
+    $errstr = "Bad or missing curgroup argument";
+    return;
+  }
+  # Fail on bad childlist argument.  This could be sanely ignored if bad, maybe.
+  if ($args{childlist} && $args{childlist} !~ /^[\d,]+$/) {
+    $errstr = "Bad childlist argument";
+    return;
+  }
 
   my @filterargs;
@@ -2250 +2282 @@
   $args{sortorder} = 'ASC' if !$args{sortorder} || !grep /^$args{sortorder}$/, ('ASC','DESC');
   $args{offset} = 0 if !$args{offset} || $args{offset} !~ /^(?:all|\d+)$/;
+
+  # Fail on bad curgroup argument.  There's no sane fallback on this one.
+  if (!$args{curgroup} || $args{curgroup} !~ /^\d+$/) {
+    $errstr = "Bad or missing curgroup argument";
+    return;
+  }
+  # Fail on bad childlist argument.  This could be sanely ignored if bad, maybe.
+  if ($args{childlist} && $args{childlist} !~ /^[\d,]+$/) {
+    $errstr = "Bad childlist argument";
+    return;
+  }
 
   my @filterargs;
@@ -2277 +2320 @@
   # A common tail.
   $sql .= " ORDER BY ".($args{sortby} eq 'group' ? 'groups.group_name' : $args{sortby})." $args{sortorder} ".
-        ($args{offset} eq 'all' ? '' : " LIMIT $config{perpage}".
-        " OFFSET ".$args{offset}*$config{perpage});
+        ($args{offset} eq 'all' ? '' : " LIMIT $self->{perpage}".
+        " OFFSET ".$args{offset}*$self->{perpage});
   my $sth = $dbh->prepare($sql);
   $sth->execute(@filterargs);
@@ -2404 +2447 @@
     my $msg = $@;
     eval { $dbh->rollback; };
-    if ($config{log_failures}) {
+    if ($self->{log_failures}) {
       $self->_log(group_id => $pargroup, entry => "Failed to add group $groupname: $msg");
       $dbh->commit;
@@ -2448 +2491 @@
     my ($domcnt) = $dbh->selectrow_array("SELECT count(*) FROM domains WHERE group_id=?", undef, ($groupid));
     die "$domcnt domains still in group\n" if $domcnt;
+    my ($revcnt) = $dbh->selectrow_array("SELECT count(*) FROM revzones WHERE group_id=?", undef, ($groupid));
+    die "$revcnt reverse zones still in group\n" if $revcnt;
     my ($usercnt) = $dbh->selectrow_array("SELECT count(*) FROM users WHERE group_id=?", undef, ($groupid));
     die "$usercnt users still in group\n" if $usercnt;
@@ -2468 +2513 @@
     my $msg = $@;
     eval { $dbh->rollback; };
-    if ($config{log_failures}) {
+    if ($self->{log_failures}) {
       $self->_log(group_id => $parid, entry => "$failmsg: $msg");
       $dbh->commit;     # since we enabled transactions earlier
@@ -2545 +2590 @@
   my %args = @_;
 
+  # Fail on bad curgroup argument.  There's no sane fallback on this one.
+  if (!$args{curgroup} || $args{curgroup} !~ /^\d+$/) {
+    $errstr = "Bad or missing curgroup argument";
+    return;
+  }
+  # Fail on bad childlist argument.  This could be sanely ignored if bad, maybe.
+  if ($args{childlist} && $args{childlist} !~ /^[\d,]+$/) {
+    $errstr = "Bad childlist argument";
+    return;
+  }
+
   my @filterargs;
-
   $args{startwith} = undef if $args{startwith} && $args{startwith} !~ /^(?:[a-z]|0-9)$/;
   push @filterargs, "^$args{startwith}" if $args{startwith};
@@ -2571 +2626 @@
   my %args = @_;
 
+  # Fail on bad curgroup argument.  There's no sane fallback on this one.
+  if (!$args{curgroup} || $args{curgroup} !~ /^\d+$/) {
+    $errstr = "Bad or missing curgroup argument";
+    return;
+  }
+  # Fail on bad childlist argument.  This could be sanely ignored if bad, maybe.
+  if ($args{childlist} && $args{childlist} !~ /^[\d,]+$/) {
+    $errstr = "Bad childlist argument";
+    return;
+  }
+
   my @filterargs;
-
   $args{startwith} = undef if $args{startwith} && $args{startwith} !~ /^(?:[a-z]|0-9)$/;
   push @filterargs, "^$args{startwith}" if $args{startwith};
@@ -2578 +2643 @@
 
   # protection against bad or missing arguments
-  $args{sortorder} = 'ASC' if !$args{sortorder};
+  $args{sortorder} = 'ASC' if !$args{sortorder} || !grep /^$args{sortorder}$/, ('ASC','DESC');
+  $args{sortby} = 'group' if !$args{sortby} || $args{sortby} !~ /^[\w_.]+$/;
   $args{offset} = 0 if !$args{offset} || $args{offset} !~ /^(?:all|\d+)$/;
 
@@ -2594 +2660 @@
         " GROUP BY g.group_id, g.group_name, g2.group_name ".
         " ORDER BY $args{sortby} $args{sortorder} ".
-        ($args{offset} eq 'all' ? '' : " LIMIT $config{perpage} OFFSET ".$args{offset}*$config{perpage});
+        ($args{offset} eq 'all' ? '' : " LIMIT $self->{perpage} OFFSET ".$args{offset}*$self->{perpage});
   my $glist = $dbh->selectall_arrayref($sql, { Slice => {} }, (@filterargs) );
   $errstr = $dbh->errstr if !$glist;
@@ -2749 +2815 @@
     my $msg = $@;
     eval { $dbh->rollback; };
-    if ($config{log_failures}) {
+    if ($self->{log_failures}) {
       $self->_log(group_id => $group, entry => "Error adding user $username: $msg");
       $dbh->commit;     # since we enabled transactions earlier
@@ -2772 +2838 @@
   my %args = @_;
 
+  # Fail on bad curgroup argument.  There's no sane fallback on this one.
+  if (!$args{curgroup} || $args{curgroup} !~ /^\d+$/) {
+    $errstr = "Bad or missing curgroup argument";
+    return;
+  }
+  # Fail on bad childlist argument.  This could be sanely ignored if bad, maybe.
+  if ($args{childlist} && $args{childlist} !~ /^[\d,]+$/) {
+    $errstr = "Bad childlist argument";
+    return;
+  }
+
   my @filterargs;
-
   $args{startwith} = undef if $args{startwith} && $args{startwith} !~ /^(?:[a-z]|0-9)$/;
   push @filterargs, "^$args{startwith}" if $args{startwith};
   push @filterargs, $args{filter} if $args{filter};
-
 
   my $sql = "SELECT count(*) FROM users ".
@@ -2801 +2876 @@
   my %args = @_;
 
+  # Fail on bad curgroup argument.  There's no sane fallback on this one.
+  if (!$args{curgroup} || $args{curgroup} !~ /^\d+$/) {
+    $errstr = "Bad or missing curgroup argument";
+    return;
+  }
+  # Fail on bad childlist argument.  This could be sanely ignored if bad, maybe.
+  if ($args{childlist} && $args{childlist} !~ /^[\d,]+$/) {
+    $errstr = "Bad childlist argument";
+    return;
+  }
+
   my @filterargs;
-
   $args{startwith} = undef if $args{startwith} && $args{startwith} !~ /^(?:[a-z]|0-9)$/;
   push @filterargs, "^$args{startwith}" if $args{startwith};
@@ -2813 +2898 @@
 
   # protection against bad or missing arguments
-  $args{sortorder} = 'ASC' if !$args{sortorder};
-  $args{sortby} = 'u.username' if !$args{sortby};
+  $args{sortorder} = 'ASC' if !$args{sortorder} || !grep /^$args{sortorder}$/, ('ASC','DESC');
+  $args{sortby} = 'u.username' if !$args{sortby} || $args{sortby} !~ /^[\w_.]+$/;
   $args{offset} = 0 if !$args{offset} || $args{offset} !~ /^(?:all|\d+)$/;
 
@@ -2825 +2910 @@
         " AND NOT u.type = 'R' ".
         " ORDER BY $args{sortby} $args{sortorder} ".
-        ($args{offset} eq 'all' ? '' : " LIMIT $config{perpage} OFFSET ".$args{offset}*$config{perpage});
+        ($args{offset} eq 'all' ? '' : " LIMIT $self->{perpage} OFFSET ".$args{offset}*$self->{perpage});
   my $ulist = $dbh->selectall_arrayref($sql, { Slice => {} }, (@filterargs) );
   $errstr = $dbh->errstr if !$ulist;
@@ -2908 +2993 @@
     my $msg = $@;
     eval { $dbh->rollback; };
-    if ($config{log_failures}) {
+    if ($self->{log_failures}) {
       $self->_log(group_id => $group, entry => "Error updating user $username: $msg");
       $dbh->commit;     # since we enabled transactions earlier
@@ -2947 +3032 @@
     my $msg = $@;
     eval { $dbh->rollback; };
-    if ($config{log_failures}) {
+    if ($self->{log_failures}) {
       $self->_log(group_id => $userdata->{group_id}, entry => "Error deleting user ID ".
         "$userid/".$userdata->{username}.": $msg");
@@ -3120 +3205 @@
     my $msg = $@;
     eval { $dbh->rollback; };
-    if ($config{log_failures}) {
+    if ($self->{log_failures}) {
       $shdesc = $loc if !$shdesc;
       $self->_log(entry => "Failed adding location ($shdesc, '$iplist'): $msg");
@@ -3167 +3252 @@
     my $msg = $@;
     eval { $dbh->rollback; };
-    if ($config{log_failures}) {
+    if ($self->{log_failures}) {
       $shdesc = $loc if !$shdesc;
       $self->_log(entry => "Failed updating location ($shdesc, '$iplist'): $msg");
@@ -3206 +3291 @@
     my $msg = $@;
     eval { $dbh->rollback; };
-    if ($config{log_failures}) {
+    if ($self->{log_failures}) {
       $self->_log(entry => "Failed to delete location ($olddesc, '$oldloc->{iplist}'): $msg");
       $dbh->commit;
@@ -3244 +3329 @@
   my %args = @_;
 
+  # Fail on bad curgroup argument.  There's no sane fallback on this one.
+  if (!$args{curgroup} || $args{curgroup} !~ /^\d+$/) {
+    $errstr = "Bad or missing curgroup argument";
+    return;
+  }
+  # Fail on bad childlist argument.  This could be sanely ignored if bad, maybe.
+  if ($args{childlist} && $args{childlist} !~ /^[\d,]+$/) {
+    $errstr = "Bad childlist argument";
+    return;
+  }
+
   my @filterargs;
-
   $args{startwith} = undef if $args{startwith} && $args{startwith} !~ /^(?:[a-z]|0-9)$/;
   push @filterargs, "^$args{startwith}" if $args{startwith};
   push @filterargs, $args{filter} if $args{filter};
-
 
   my $sql = "SELECT count(*) FROM locations ".
@@ -3268 +3362 @@
   my %args = @_;
 
+  # Fail on bad curgroup argument.  There's no sane fallback on this one.
+  if (!$args{curgroup} || $args{curgroup} !~ /^\d+$/) {
+    $errstr = "Bad or missing curgroup argument";
+    return;
+  }
+  # Fail on bad childlist argument.  This could be sanely ignored if bad, maybe.
+  if ($args{childlist} && $args{childlist} !~ /^[\d,]+$/) {
+    $errstr = "Bad childlist argument";
+    return;
+  }
+
   my @filterargs;
-
   $args{startwith} = undef if $args{startwith} && $args{startwith} !~ /^(?:[a-z]|0-9)$/;
   push @filterargs, "^$args{startwith}" if $args{startwith};
@@ -3280 +3384 @@
 
   # protection against bad or missing arguments
-  $args{sortorder} = 'ASC' if !$args{sortorder};
-  $args{sortby} = 'l.description' if !$args{sortby};
+  $args{sortorder} = 'ASC' if !$args{sortorder} || !grep /^$args{sortorder}$/, ('ASC','DESC');
+  $args{sortby} = 'l.description' if !$args{sortby} || $args{sortby} !~ /^[\w_.]+$/;
   $args{offset} = 0 if !$args{offset} || $args{offset} !~ /^(?:all|\d+)$/;
 
@@ -3291 +3395 @@
         ($args{filter} ? " AND l.description ~* ?" : '').
         " ORDER BY $args{sortby} $args{sortorder} ".
-        ($args{offset} eq 'all' ? '' : " LIMIT $config{perpage} OFFSET ".$args{offset}*$config{perpage});
+        ($args{offset} eq 'all' ? '' : " LIMIT $self->{perpage} OFFSET ".$args{offset}*$self->{perpage});
   my $ulist = $dbh->selectall_arrayref($sql, { Slice => {} }, (@filterargs) );
   $errstr = $dbh->errstr if !$ulist;
@@ -3411 +3515 @@
     $logdata{entry} = "Error updating ".($defrec eq 'y' ? ($revrec eq 'y' ? 'default reverse zone ' : 'default ') : '').
         "SOA record for $parname: $msg";
-    if ($config{log_failures}) {
+    if ($self->{log_failures}) {
       $self->_log(%logdata);
       $dbh->commit;
@@ -3433 +3537 @@
   my $id = shift;
 
+##fixme: do we need a knob to twist to switch between unix epoch and postgres time string?
   my $sql = "SELECT record_id,host,type,val,ttl".
         ($defrec eq 'n' ? ',location' : '').
         ($revrec eq 'n' ? ',distance,weight,port' : '').
-        (($defrec eq 'y') ? ',group_id FROM ' : ',domain_id,rdns_id FROM ').
+        (($defrec eq 'y') ? ',group_id FROM ' : ',domain_id,rdns_id,stamp,stamp < now() AS ispast,expires,stampactive FROM ').
         _rectable($defrec,$revrec)." WHERE record_id=?";
   my $ret = $dbh->selectrow_hashref($sql, undef, ($id) );
@@ -3465 +3570 @@
 
 ##fixme: should use above (getRecLine()) to get lines for below?
-## DNSDB::getDomRecs()
-# Return records for a domain
-# Takes a database handle, default/live flag, group/domain ID, start,
+## DNSDB::getRecList()
+# Return records for a group or zone
+# Takes a default/live flag, group or zone ID, start,
 # number of records, sort field, and sort order
 # Returns a reference to an array of hashes
-sub getDomRecs {
+sub getRecList {
   $errstr = '';
   my $self = shift;
@@ -3482 +3587 @@
 
   # protection against bad or missing arguments
-  $args{sortorder} = 'ASC' if !$args{sortorder};
-  $args{sortby} = 'host' if !$args{sortby} && $args{revrec} eq 'n';     # default sort by host on domain record list
-  $args{sortby} = 'val' if !$args{sortby} && $args{revrec} eq 'y';      # default sort by IP on revzone record list
+  $args{sortorder} = 'ASC' if !$args{sortorder} || !grep /^$args{sortorder}$/, ('ASC','DESC');
+  my $defsort;
+  $defsort = 'host' if $args{revrec} eq 'n';     # default sort by host on domain record list
+  $defsort = 'val' if $args{revrec} eq 'y';      # default sort by IP on revzone record list
+  $args{sortby} = '' if !$args{sortby};
+  $args{sortby} = $defsort if !$args{revrec};
+  $args{sortby} = $defsort if $args{sortby} !~ /^[\w_,.]+$/;
   $args{offset} = 0 if !$args{offset} || $args{offset} !~ /^(?:all|\d+)$/;  
+  my $perpage = ($args{nrecs} ? $args{nrecs} : $self->{perpage});
 
   # sort reverse zones on IP, correctly
@@ -3508 +3618 @@
   $newsort =~ s/^,//;
 
+##fixme:  do we need a knob to twist to switch from unix epoch to postgres time string?
+  my $sql = "SELECT r.record_id,r.host,r.type,r.val,r.ttl";
+  $sql .= ",l.description AS locname,stamp,r.stamp < now() AS ispast,r.expires,r.stampactive"
+        if $args{defrec} eq 'n';
+  $sql .= ",r.distance,r.weight,r.port" if $args{revrec} eq 'n';
+  $sql .= " FROM "._rectable($args{defrec},$args{revrec})." r ";
   $sql .= "INNER JOIN rectypes t ON r.type=t.val ";     # for sorting by type alphabetically
   $sql .= "LEFT JOIN locations l ON r.location=l.location " if $args{defrec} eq 'n';
@@ -3516 +3632 @@
   # ensure consistent ordering by sorting on record_id too
   $sql .= ", record_id $args{sortorder}";
-  $sql .= ($args{offset} eq 'all' ? '' : " LIMIT $config{perpage} OFFSET ".$args{offset}*$config{perpage});
+  $sql .= ($args{offset} eq 'all' ? '' : " LIMIT $perpage OFFSET ".$args{offset}*$perpage);
 
   my @bindvars = ($args{id});
@@ -3522 +3638 @@
 
   my $ret = $dbh->selectall_arrayref($sql, { Slice => {} }, (@bindvars) );
+  $errstr = "Error retrieving records: ".$dbh->errstr if !$ret;
+
   return $ret;
-} # end getDomRecs()
+} # end getRecList()
 
 
@@ -3581 +3699 @@
   $location  = '' if !$location;
 
+  my $expires = shift;
+  $expires = 1 if $expires eq 'until';  # Turn some special values into the appropriate booleans.
+  $expires = 0 if $expires eq 'after';
+  my $stamp = shift;
+  $stamp = '' if !$stamp;        # Timestamp should be a string at this point.
+
   # Spaces are evil.
   $host =~ s/^\s+//;
@@ -3590 +3714 @@
   }
 
-  # Validation
-  my $addr = NetAddr::IP->new($val);
-  if ($rectype == $reverse_typemap{A}) {
-    return ('FAIL',$typemap{$rectype}." record must be a valid IPv4 address")
-        unless $addr && !$addr->{isv6};
-  }
-  if ($rectype == $reverse_typemap{AAAA}) {
-    return ('FAIL',$typemap{$rectype}." record must be a valid IPv6 address")
-        unless $addr && $addr->{isv6};
-  }
+  if ($self->{lowercase}) {
+    if ($typemap{$$rectype} ne 'TXT') {
+      $$host = lc($$host);
+      $$val = lc($$val);
+    } else {
+      # TXT records should preserve user entry in the string.
+      if ($revrec eq 'n') {
+        $$host = lc($$host);
+      } else {
+        $$val = lc($$val);
+      }
+    }
+  }
+
+  # prep for validation
+  my $addr = NetAddr::IP->new($$val);
+  $$host =~ s/\.+$//;   # FQDNs ending in . are an internal detail, and really shouldn't be exposed in the UI.
 
   my $domid = 0;
@@ -3610 +3741 @@
   return ('FAIL', "TTL must be numeric") unless $ttl =~ /^\d+$/;
 
-  # Quick check on hostname parts.  Note the regex is more forgiving than the error message;
-  # domain names technically are case-insensitive, and we use printf-like % codes for a couple
-  # of types.  Other things may also be added to validate default records of several flavours.
-  return ('FAIL', "Hostnames may not contain anything other than (0-9 a-z . _)")
-        if $defrec eq 'n' && ($revrec eq 'y' ? $$rectype != $reverse_typemap{TXT} : 1) &&
-                $$host !~ /^[0-9a-z_%.-]+$/i;
+  # Quick check on hostname parts.  There are enough variations to justify a sub now.
+  return ('FAIL', $errstr) if ! _check_hostname_form($$host, $$rectype, $defrec, $revrec);
 
   # Collect these even if we're only doing a simple A record so we can call *any* validation sub
@@ -3637 +3764 @@
   push @vallist, ($$host,$$rectype,$$val,$ttl,$id);
 
-  # locations are not for default records, silly coder!
   if ($defrec eq 'n') {
+    # locations are not for default records, silly coder!
     $fields .= ",location";
     push @vallist, $location;
-  }
+    # timestamps are rare.
+    if ($stamp) {
+      $fields .= ",stamp,expires,stampactive";
+      push @vallist, $stamp, $expires, 'y';
+    } else {
+      $fields .= ",stampactive";
+      push @vallist, 'n';
+    }
+  }
+
+  # a little magic to get the right number of ? placeholders based on how many values we're providing
   my $vallen = '?'.(',?'x$#vallist);
 
@@ -3669 +3806 @@
   $logdata{entry} .= "', TTL $ttl";
   $logdata{entry} .= ", location ".$self->getLoc($location)->{description} if $location;
+  $logdata{entry} .= ($expires eq 'after' ? ', valid after ' : ', expires at ').$stamp if $stamp;
 
   # Allow transactions, and raise an exception on errors so we can catch it later.
@@ -3684 +3822 @@
     my $msg = $@;
     eval { $dbh->rollback; };
-    if ($config{log_failures}) {
+    if ($self->{log_failures}) {
       $logdata{entry} = "Failed adding ".($defrec eq 'y' ? 'default ' : '').
         "record '$$host $typemap{$$rectype} $$val', TTL $ttl ($msg)";
@@ -3722 +3860 @@
   $location  = '' if !$location;
 
-  # prep for validation
-  my $addr = NetAddr::IP->new($$val);
-  $$host =~ s/\.+$//;   # FQDNs ending in . are an internal detail, and really shouldn't be exposed in the UI.
+  my $expires = shift;
+  $expires = 1 if $expires eq 'until';  # Turn some special values into the appropriate booleans.
+  $expires = 0 if $expires eq 'after';
+  my $stamp = shift;
+  $stamp = '' if !$stamp;        # Timestamp should be a string at this point.
+
+  # just set it to an empty string;  failures will be caught later.
+  $$host = '' if !$$host;
 
   # Spaces are evil.
@@ -3735 +3878 @@
   }
 
+  if ($self->{lowercase}) {
+    if ($typemap{$$rectype} ne 'TXT') {
+      $$host = lc($$host);
+      $$val = lc($$val);
+    } else {
+      # TXT records should preserve user entry in the string.
+      if ($revrec eq 'n') {
+        $$host = lc($$host);
+      } else {
+        $$val = lc($$val);
+      }
+    }
+  }
+
+  # prep for validation
+  my $addr = NetAddr::IP->new($$val);
+  $$host =~ s/\.+$//;   # FQDNs ending in . are an internal detail, and really shouldn't be exposed in the UI.
+
   my $domid = 0;
   my $revid = 0;
@@ -3744 +3905 @@
   return ('FAIL', "TTL must be numeric") unless $ttl =~ /^\d+$/;
 
-  # Quick check on hostname parts.  Note the regex is more forgiving than the error message;
-  # domain names technically are case-insensitive, and we use printf-like % codes for a couple
-  # of types.  Other things may also be added to validate default records of several flavours.
-  return ('FAIL', "Hostnames may not contain anything other than (0-9 a-z - . _)")
-        if $defrec eq 'n' && ($revrec eq 'y' ? $$rectype != $reverse_typemap{TXT} : 1) &&
-                $$host !~ /^[0-9a-z_%.-]+$/i;
+  # Quick check on hostname parts.  There are enough variations to justify a sub now.
+  return ('FAIL', $errstr) if ! _check_hostname_form($$host, $$rectype, $defrec, $revrec);
 
   # only MX and SRV will use these
@@ -3780 +3937 @@
         ($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') {
+    # locations are not for default records, silly coder!
     $fields .= ",location";
     push @vallist, $location;
+    # timestamps are rare.
+    if ($stamp) {
+      $fields .= ",stamp,expires,stampactive";
+      push @vallist, $stamp, $expires, 'y';
+    } else {
+      $fields .= ",stampactive";
+      push @vallist, 'n';
+    }
   }
 
@@ -3837 +4002 @@
   $logdata{entry} .= "', TTL $oldrec->{ttl}";
   $logdata{entry} .= ", location ".$self->getLoc($oldrec->{location})->{description} if $oldrec->{location};
+  $logdata{entry} .= ($oldrec->{expires} ? ', expires at ' : ', valid after ').$oldrec->{stamp}
+        if $oldrec->{stampactive};
   $logdata{entry} .= "\nto\n";
   # More NS special
@@ -3848 +4015 @@
   $logdata{entry} .= "', TTL $ttl";
   $logdata{entry} .= ", location ".$self->getLoc($location)->{description} if $location;
+  $logdata{entry} .= ($expires eq 'after' ? ', valid after ' : ', expires at ').$stamp if $stamp;
 
   local $dbh->{AutoCommit} = 0;
@@ -3864 +4032 @@
     my $msg = $@;
     eval { $dbh->rollback; };
-    if ($config{log_failures}) {
+    if ($self->{log_failures}) {
       $logdata{entry} = "Failed updating ".($defrec eq 'y' ? 'default ' : '').
         "record '$oldrec->{host} $typemap{$oldrec->{type}} $oldrec->{val}', TTL $oldrec->{ttl} ($msg)";
@@ -3975 +4143 @@
     my $msg = $@;
     eval { $dbh->rollback; };
-    if ($config{log_failures}) {
+    if ($self->{log_failures}) {
       $logdata{entry} = "Error deleting ".($defrec eq 'y' ? 'default record' : 'record').
         " '$oldrec->{host} $typemap{$oldrec->{type}} $oldrec->{val}', TTL $oldrec->{ttl} ($msg)";
@@ -4011 +4179 @@
   $args{logtype} = 'domain' if $args{logtype} eq 'dom';         # hack pthui
   return if !grep /^$args{logtype}$/, ('group', 'domain', 'revzone', 'user');
-
-  $args{logtype} = 'revzone' if $args{logtype} eq 'rdns';       # hack pthui
 
   my $sql = "SELECT count(*) FROM log ".
@@ -4047 +4213 @@
 
   # Sorting defaults
-  $args{sortby} = 'stamp' if !$args{sortby};
-  $args{sortorder} = 'DESC' if !$args{sortorder};
+  $args{sortorder} = 'DESC' if !$args{sortorder} || !grep /^$args{sortorder}$/, ('ASC','DESC');
+  $args{sortby} = 'stamp' if !$args{sortby} || $args{sortby} !~ /^[\w_.]+$/;
   $args{offset} = 0 if !$args{offset} || $args{offset} !~ /^(?:all|\d+)$/;
 
@@ -4060 +4226 @@
         ($args{filter} ? " AND entry ~* ?" : '').
         " ORDER BY $args{sortby} $args{sortorder}, log_id $args{sortorder}".
-        ($args{offset} eq 'all' ? '' : " LIMIT $config{perpage} OFFSET ".$args{offset}*$config{perpage});
+        ($args{offset} eq 'all' ? '' : " LIMIT $self->{perpage} OFFSET ".$args{offset}*$self->{perpage});
   my $loglist = $dbh->selectall_arrayref($sql, { Slice => {} }, ($args{id}, @filterargs) );
   $errstr = $dbh->errstr if !$loglist;
@@ -4111 +4277 @@
     # default;  forward zone types.  technically $type eq 'f' but not worth the error message.
     $sql .= "stdflag=1 OR stdflag=2";
+    $sql .= " AND val < 65280" if $recgroup eq 'fo';  # An extra flag to trim off the pseudotypes as well.
   }
   $sql .= " ORDER BY listorder";
@@ -4243 +4410 @@
       $limiter++;
 ##fixme:  how often will this happen on a live site?  fail at max limiter <n>?
+# 2013/10/22 only seems to happen when you request an entity that doesn't exist.
       warn "no results looking for $sql with id $id (depth $limiter)\n";
       last;
@@ -4841 +5009 @@
   my %recflags;
 
-  my $domsth = $dbh->prepare("SELECT domain_id,domain,status,changed FROM domains WHERE status=1");
-  my $recsth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl,record_id,location ".
-        "FROM records WHERE domain_id=? AND type < 65280");     # Just exclude all types relating to rDNS
-  my $zonesth = $dbh->prepare("UPDATE domains SET changed='n' WHERE domain_id=?");
-  $domsth->execute();
-  while (my ($domid,$dom,$domstat,$changed) = $domsth->fetchrow_array) {
-##fixme: need to find a way to block opening symlinked files without introducing a race.
-#       O_NOFOLLOW
-#              If  pathname  is a symbolic link, then the open fails.  This is a FreeBSD extension, which was
-#              added to Linux in version 2.1.126.  Symbolic links in earlier components of the pathname  will
-#              still be followed.
-# but that doesn't help other platforms.  :/
-    sysopen(ZONECACHE, "$config{exportcache}/$dom", O_RDWR|O_CREAT);
-    flock(ZONECACHE, LOCK_EX);
-    if ($changed || -s "$config{exportcache}/$dom" == 0) {
-      $recsth->execute($domid);
-      while (my ($host,$type,$val,$dist,$weight,$port,$ttl,$recid,$loc) = $recsth->fetchrow_array) {
-        next if $recflags{$recid};
-
-        $loc = '' if !$loc;     # de-nullify - just in case
-##fixme:  handle case of record-with-location-that-doesn't-exist better.
-# note this currently fails safe (tested) - records with a location that
-# doesn't exist will not be sent to any client
-#       $loc = '' if !$lochash->{$loc};
-
-##fixme:  record validity timestamp. tinydns supports fiddling with timestamps.
-# note $ttl must be set to 0 if we want to use tinydns's auto-expiring timestamps.
-# timestamps are TAI64
-# ~~ 2^62 + time()
-        my $stamp = '';
-
-        # support tinydns' auto-TTL
-        $ttl = '' if $ttl == '0';
-
-        # 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));
-
-        $recflags{$recid} = 1;
-      } # while ($recsth)
-    }
-    # stream from cache, whether freshly created or existing
-    print $datafile $_ while <ZONECACHE>;
-    close ZONECACHE;
-    # mark domain as unmodified
-    $zonesth->execute($domid);
-  } # while ($domsth)
-
-  my $revsth = $dbh->prepare("SELECT rdns_id,revnet,status,changed FROM revzones WHERE status=1 ".
-        "ORDER BY masklen(revnet) DESC");
-
 # For reasons unknown, we can't sanely UNION these statements.  Feh.
 # Supposedly it should work though (note last 3 lines):
@@ -4918 +5023 @@
   my $soasth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl,record_id,location ".
         "FROM records WHERE rdns_id=? AND type=6");
-  $recsth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl,record_id,location ".
+  my $recsth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl,record_id,location,extract(epoch from stamp),expires,stampactive ".
         "FROM records WHERE rdns_id=? AND not type=6 ".
         "ORDER BY masklen(CAST(val AS inet)) DESC, CAST(val AS inet)");
-  $zonesth = $dbh->prepare("UPDATE revzones SET changed='n' WHERE rdns_id=?");
+  my $revsth = $dbh->prepare("SELECT rdns_id,revnet,status,changed FROM revzones WHERE status=1 ".
+        "ORDER BY masklen(revnet) DESC");
+  my $zonesth = $dbh->prepare("UPDATE revzones SET changed='n' WHERE rdns_id=?");
   $revsth->execute();
   while (my ($revid,$revzone,$revstat,$changed) = $revsth->fetchrow_array) {
@@ -4931 +5038 @@
 # but that doesn't help other platforms.  :/
     my $tmpzone = NetAddr::IP->new($revzone);
-    sysopen(ZONECACHE, "$config{exportcache}/".$tmpzone->network->addr, O_RDWR|O_CREAT);
-    flock(ZONECACHE, LOCK_EX);
-    if ($changed || -s "$config{exportcache}/".$tmpzone->network->addr == 0) {
-      # need to fetch this separately since the rest of the records all (should) have real IPs in val
-      $soasth->execute($revid);
-      my (@zsoa) = $soasth->fetchrow_array();
-      _printrec_tiny(*ZONECACHE,'y',\%recflags,$revzone,
-        $zsoa[0],$zsoa[1],$zsoa[2],$zsoa[3],$zsoa[4],$zsoa[5],$zsoa[6],$zsoa[8],'');
-
-      $recsth->execute($revid);
-      while (my ($host,$type,$val,$dist,$weight,$port,$ttl,$recid,$loc) = $recsth->fetchrow_array) {
-        next if $recflags{$recid};
-
-        $loc = '' if !$loc;     # de-nullify - just in case
+##fixme:  locations/views?  subnet mask?  need to avoid possible collisions with zone/superzone
+##        (eg /20 vs /24, starting on .0.0)
+    my $cz = $tmpzone->network->addr."-".$tmpzone->masklen;
+    my $cachefile = "$self->{exportcache}/$cz";
+    my $tmpcache = "$self->{exportcache}/tmp.$cz.$$";
+    eval {
+
+      # only update the cache file if the zone has changed, or if the cache file has nothing in it.
+      if ($self->{force_refresh} || $changed || !-e $cachefile || -z $cachefile) {
+        open ZONECACHE, ">$tmpcache" or die "Error creating temporary file $tmpcache: $!\n";
+
+        # need to fetch this separately since the rest of the records all (should) have real IPs in val
+        $soasth->execute($revid);
+        my (@zsoa) = $soasth->fetchrow_array();
+        _printrec_tiny(*ZONECACHE,'y',\%recflags,$revzone,
+          $zsoa[0],$zsoa[1],$zsoa[2],$zsoa[3],$zsoa[4],$zsoa[5],$zsoa[6],$zsoa[8],'');
+
+        $recsth->execute($revid);
+        while (my ($host,$type,$val,$dist,$weight,$port,$ttl,$recid,$loc,$stamp,$expires,$stampactive) = $recsth->fetchrow_array) {
+          next if $recflags{$recid};
+
+# not sure this is necessary for revzones.
+#         # Spaces are evil.
+#         $val =~ s/^\s+//;
+#         $val =~ s/\s+$//;
+#         if ($typemap{$type} ne 'TXT') {
+#           # Leading or trailng spaces could be legit in TXT records.
+#           $host =~ s/^\s+//;
+#           $host =~ s/\s+$//;
+#         }
+
+          _printrec_tiny(*ZONECACHE, 'y', \%recflags, $revzone,
+            $host, $type, $val, $dist, $weight, $port, $ttl, $loc, $stamp, $expires, $stampactive)
+                if *ZONECACHE;
+
+          $recflags{$recid} = 1;
+
+        } # while ($recsth)
+
+        close ZONECACHE; # force the file to be written
+
+        # catch obvious write errors that leave an empty temp file
+        if (-s $tmpcache) {
+          rename $tmpcache, $cachefile
+            or die "Error overwriting cache file $cachefile with temporary file: $!\n";
+        }
+
+      } # if $changed or cache filesize is 0
+
+    };
+    if ($@) {
+      print "error writing new data for $revzone: $@\n";
+      # error!  something borked, and we should be able to fall back on the old cache file
+      # report the error, somehow.
+    } else {
+      # mark zone as unmodified.  Only do this if no errors, that way
+      # export failures should recover a little more automatically.
+      $zonesth->execute($revid);
+    }
+    # Always stream the cache (even if stale or obsolete due to errors creating the new cache)
+    open CACHE, "<$cachefile";
+    print $datafile $_ while <CACHE>;
+    close CACHE;
+
+  } # while ($revsth)
+
+  my $domsth = $dbh->prepare("SELECT domain_id,domain,status,changed FROM domains WHERE status=1");
+  $recsth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl,record_id,location,extract(epoch from stamp),expires,stampactive ".
+        "FROM records WHERE domain_id=?");      # Just exclude all types relating to rDNS
+#       "FROM records WHERE domain_id=? AND type < 65280");     # Just exclude all types relating to rDNS
+  $zonesth = $dbh->prepare("UPDATE domains SET changed='n' WHERE domain_id=?");
+  $domsth->execute();
+  while (my ($domid,$dom,$domstat,$changed) = $domsth->fetchrow_array) {
+##fixme: need to find a way to block opening symlinked files without introducing a race.
+#       O_NOFOLLOW
+#              If  pathname  is a symbolic link, then the open fails.  This is a FreeBSD extension, which was
+#              added to Linux in version 2.1.126.  Symbolic links in earlier components of the pathname  will
+#              still be followed.
+# but that doesn't help other platforms.  :/
+    my $cachefile = "$self->{exportcache}/$dom";
+    my $tmpcache = "$self->{exportcache}/tmp.$dom.$$";
+    eval {
+
+      # only update the cache file if the zone has changed, or if the cache file has nothing in it.
+      if ($self->{force_refresh} || $changed || !-e $cachefile || -z $cachefile) {
+        open ZONECACHE, ">$tmpcache" or die "Error creating temporary file $tmpcache: $!\n";
+
+        $recsth->execute($domid);
+        while (my ($host,$type,$val,$dist,$weight,$port,$ttl,$recid,$loc,$stamp,$expires,$stampactive) = $recsth->fetchrow_array) {
+          next if $recflags{$recid};
+
+          # 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, $expires, $stampactive)
+                if *ZONECACHE;
+
+          $recflags{$recid} = 1;
+
+        } # while ($recsth)
+
+        close ZONECACHE; # force the file to be written
+
+        # catch obvious write errors that leave an empty temp file
+        if (-s $tmpcache) {
+          rename $tmpcache, $cachefile
+            or die "Error overwriting cache file $cachefile with temporary file: $!\n";
+        }
+
+      } # if $changed or cache filesize is 0
+
+    };
+    if ($@) {
+      print "error writing new data for $dom: $@\n";
+      # error!  something borked, and we should be able to fall back on the old cache file
+      # report the error, somehow.
+    } else {
+      # mark domain as unmodified.  Only do this if no errors, that way
+      # export failures should recover a little more automatically.
+      $zonesth->execute($domid);
+    }
+    # Always stream the cache (even if stale or obsolete due to errors creating the new cache)
+    open CACHE, "<$cachefile";
+    print $datafile $_ while <CACHE>;
+    close CACHE;
+
+  } # while ($domsth)
+
+} # end __export_tiny()
+
+
+# Utility sub for __export_tiny above
+sub _printrec_tiny {
+  my ($datafile,$revrec,$recflags,$zone,$host,$type,$val,$dist,$weight,$port,$ttl,$loc,$stamp,$expires,$stampactive) = @_;
+
+  $loc = '' if !$loc;   # de-nullify - just in case
 ##fixme:  handle case of record-with-location-that-doesn't-exist better.
 # note this currently fails safe (tested) - records with a location that
@@ -4950 +5186 @@
 #       $loc = '' if !$lochash->{$loc};
 
-##fixme:  record validity timestamp. tinydns supports fiddling with timestamps.
-# note $ttl must be set to 0 if we want to use tinydns's auto-expiring timestamps.
-# timestamps are TAI64
-# ~~ 2^62 + time()
-        my $stamp = '';
-
-        # support tinydns' auto-TTL
-        $ttl = '' if $ttl == '0';
-
-        _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));
-
-        $recflags{$recid} = 1;
-      } # while ($recsth)
-    }
-    # stream from cache, whether freshly created or existing
-    print $datafile $_ while <ZONECACHE>;
-    close ZONECACHE;
-    # mark zone as unmodified
-    $zonesth->execute($revid);
-  } # while ($domsth)
-
-} # end __export_tiny()
-
-
-# Utility sub for __export_tiny above
-sub _printrec_tiny {
-  my ($datafile,$revrec,$recflags,$zone,$host,$type,$val,$dist,$weight,$port,$ttl,$loc,$stamp) = @_;
+
+## Records that are valid only before or after a set time
+
+# record due to expire sometime is the complex case.  we don't want to just
+# rely on tinydns' auto-adjusting TTLs, because the default TTL in that case
+# is one day instead of the SOA minttl as BIND might do.
+
+# consider the case where a record is set to expire a week ahead, but the next
+# day later you want to change it NOW (or as NOWish as you get with your DNS
+# management practice).  but now you're stuck, because someone, somewhere, 
+# has just done a lookup before your latest change was published, and they'll
+# be caching that old, broken record for 1 day instead of your zone default
+# TTL.
+
+# $stamp-$ttl is the *latest* we can publish the record with the defined TTL
+# to still have the expiry happen as scheduled, but we need to find some
+# *earlier* point.  We can maybe guess, and 2x TTL is probably reasonable,
+# but we need info on the export frequency.
+
+# export the normal, non-expiring record up until $stamp-<guesstimate>, then
+# switch to exporting a record with the TAI64 stamp and a 0 TTL so tinydns
+# takes over TTL management.
+
+  if ($stampactive) {
+    if ($expires) {
+      # record expires at $stamp;  decide if we need to keep the TTL and ignore
+      # the stamp for a time or if we need to change the TTL to 0 and convert
+      # $stamp to TAI64 so tinydns can use $stamp to autoadjust the TTL on the fly.
+# extra hack, optimally needs more knowledge of data export frequency
+# smack the idiot customer who insists on 0 TTLs;  they can suck up and
+# deal with a 10-minute TTL.  especially on scheduled changes.  note this
+# should be (export freq * 2), but we don't know the actual export frequency.
+$ttl = 300 if $ttl == 0;        #hack phtui
+      my $ahead = (86400 < $ttl*2 ? 86400 : $ttl*2);
+      if ((time() + $ahead) < $stamp) {
+        # more than 2x TTL OR more than one day (whichever is less) from expiry time;  publish normal record
+        $stamp = '';
+      } else {
+        # less than 2x TTL from expiry time, let tinydns take over TTL management and publish the TAI64 stamp.
+        $ttl = 0;
+        $stamp = unixtai64($stamp);
+        $stamp =~ s/\@//;
+      }
+    } else {
+      # record is "active after";  convert epoch from database to TAI64, publish, and collect $200.
+      $stamp = unixtai64($stamp);
+      $stamp =~ s/\@//;
+    }
+  } else {
+    # flag for active timestamp is false;  don't actually put a timestamp in the output
+    $stamp = '';
+  }
+
+  # support tinydns' auto-TTL
+  $ttl = '' if $ttl == -1;
+# these are WAY FREAKING HIGH - higher even than most TLD registry TTLs!
+# NS          259200  => 3d
+# all others   86400  => 1d
+
+  if ($revrec eq 'y') {
+    $val = $zone if $val eq '@';
+  } else {
+    $host = $zone if $host eq '@';
+  }
 
   ## Convert a bare number into an octal-coded pair of octets.
@@ -5202 +5470 @@
       } elsif ($type == 65281) { # AAAA+PTR
 
-#$$recflags{$val}++;
+        $$recflags{$val}++;
         # treat these as two separate records.  since tinydns doesn't have
         # a native combined type, we have to create them separately anyway.
-        if ($revrec eq 'n') {
-          $type = 28;
-        } else {
-          $type = 12;
-        }
-        _printrec_tiny($datafile,$revrec,$recflags,$zone,$host,$type,$val,$dist,$weight,$port,$ttl,$loc,$stamp);
+        # print both;  a dangling record is harmless, and impossible via web
+        # UI anyway
+        _printrec_tiny($datafile,$revrec,$recflags,$zone,$host,28,$val,$dist,$weight,$port,$ttl,$loc,$stamp);
+        _printrec_tiny($datafile,$revrec,$recflags,$zone,$host,12,$val,$dist,$weight,$port,$ttl,$loc,$stamp);
 ##fixme: add a config flag to indicate use of the patch from http://www.fefe.de/dns/
 # type 6 is for AAAA+PTR, type 3 is for AAAA
@@ -5309 +5575 @@
   my ($subj,$message) = @_;
 
-  return if $config{mailhost} eq 'smtp.example.com';   # do nothing if still using default SMTP host.
-
-  my $mailer = Net::SMTP->new($config{mailhost}, Hello => "dnsadmin.$config{domain}");
-
-  my $mailsender = ($config{mailsender} ? $config{mailsender} : $config{mailnotify});
+  return if $self->{mailhost} eq 'smtp.example.com';   # do nothing if still using default SMTP host.
+
+  my $mailer = Net::SMTP->new($self->{mailhost}, Hello => "dnsadmin.$self->{domain}");
+
+  my $mailsender = ($self->{mailsender} ? $self->{mailsender} : $self->{mailnotify});
 
   $mailer->mail($mailsender);
-  $mailer->to($config{mailnotify});
-  $mailer->data("From: \"$config{mailname}\" <$mailsender>\n",
-        "To: <$config{mailnotify}>\n",
+  $mailer->to($self->{mailnotify});
+  $mailer->data("From: \"$self->{mailname}\" <$mailsender>\n",
+        "To: <$self->{mailnotify}>\n",
         "Date: ".strftime("%a, %d %b %Y %H:%M:%S %z",localtime)."\n",
         "Subject: $subj\n",
-        "X-Mailer: DNSAdmin Notify v".sprintf("%.1d",$DNSDB::VERSION)."\n",
-        "Organization: $config{orgname}\n",
+        "X-Mailer: DNSAdmin v".$DNSDB::VERSION." Notify\n",
+        "Organization: $self->{orgname}\n",
         "\n$message\n");
   $mailer->quit;