Changeset 642 for trunk

Timestamp:

06/10/14 13:32:27 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix log entry/user-info message for adding or editing record
expiry/valid-after times; "valid after" would be incorrectly
shown/logged as "expires at". The record would be created and
exported correctly.

File:

• trunk/DNSDB.pm (modified) (2 diffs)

trunk/DNSDB.pm

@@ -4203 +4203 @@
   $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;
+  $logdata{entry} .= ($expires ? ', expires at ' : ', valid after ').$stamp if $stamp;
 
   # Allow transactions, and raise an exception on errors so we can catch it later.
@@ -4399 +4399 @@
   $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;
+  $logdata{entry} .= ($expires ? ', expires at ' : ', valid after ').$stamp if $stamp;
 
   local $dbh->{AutoCommit} = 0;