Changeset 290 for trunk/dns.cgi

Timestamp:

03/27/12 14:57:39 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Move action logging for delRec() into DNSDB.pm. See #35

File:

• trunk/dns.cgi (modified) (1 diff)

trunk/dns.cgi

@@ -780 +780 @@
     $page->param(recval => $rec->{val});
   } elsif ($webvar{del} eq 'ok') {
-# get rec data before we try to delete it
-    my $rec = getRecLine($dbh, $webvar{defrec}, $webvar{revrec}, $webvar{id});
     my ($code,$msg) = delRec($dbh, $webvar{defrec}, $webvar{revrec}, $webvar{id});
     if ($code eq 'OK') {
-      if ($webvar{defrec} eq 'y') {
-        my $recclass = ($webvar{revrec} eq 'n' ? 'default record' : 'default reverse record');
-##fixme:  log distance for MX;  log port/weight/distance for SRV
-        my $restr = "Deleted $recclass '$rec->{host} $typemap{$rec->{type}} $rec->{val}', TTL $rec->{ttl}";
-        logaction(0, $session->param("username"), $rec->{parid}, $restr);
-        changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec},
-                revrec => $webvar{revrec}, resultmsg => $restr);
-      } else {
-        my $recclass = ($webvar{revrec} eq 'n' ? 'record' : 'reverse record');
-        my $restr = "Deleted $recclass '$rec->{host} $typemap{$rec->{type}} $rec->{val}', TTL $rec->{ttl}";
-        logaction($rec->{parid}, $session->param("username"),
-                parentID($dbh, (id => $rec->{parid}, type => 'domain', revrec => $webvar{revrec})),
-                $restr);
-        changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec},
-                revrec => $webvar{revrec}, resultmsg => $restr);
-      }
+      changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec},
+                revrec => $webvar{revrec}, resultmsg => $msg);
     } else {
 ## need to find failure mode
-      if ($config{log_failures}) {
-        if ($webvar{defrec} eq 'y') {
-          logaction(0, $session->param("username"), $rec->{parid},
-                "Failed deleting default record '$rec->{host} $typemap{$rec->{type}} $rec->{val}',".
-                " TTL $rec->{ttl} ($msg)");
-        } else {
-          logaction($rec->{parid}, $session->param("username"),
-                parentID($dbh, (id => $rec->{parid}, type => 'domain', revrec => $webvar{revrec})),
-                "Failed deleting record '$rec->{host} $typemap{$rec->{type}} $rec->{val}', TTL $rec->{ttl} ($msg)");
-        }
-      }
       changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec},
-                revrec => $webvar{revrec}, errmsg => "Error deleting record: $msg");
+                revrec => $webvar{revrec}, errmsg => $msg);
     }
   } else {