Changeset 289

Timestamp:

03/27/12 12:56:12 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Forgot to move failed-action logging for addRec() and
updateRec(), done.
Removed commented domain-name-canonicalization for record-update page
See #35

Location:

trunk

Files:

• DNSDB.pm (modified) (2 diffs)
• dns.cgi (modified) (3 diffs)

trunk/DNSDB.pm

@@ -2535 +2535 @@
     my $msg = $@;
     eval { $dbh->rollback; };
+    if ($config{log_failures}) {
+      $logdata{entry} = "Failed adding ".($defrec eq 'y' ? 'default ' : '').
+        "record '$$host $typemap{$$rectype} $$val', TTL $ttl ($msg)";
+      _log($dbh, %logdata);
+      $dbh->commit;
+    }
     return ('FAIL',$msg);
   }
@@ -2665 +2671 @@
     my $msg = $@;
     eval { $dbh->rollback; };
+    if ($config{log_failures}) {
+      $logdata{entry} = "Failed updating ".($defrec eq 'y' ? 'default ' : '').
+        "record '$oldrec->{host} $typemap{$oldrec->{type}} $oldrec->{val}', TTL $oldrec->{ttl} ($msg)";
+      _log($dbh, %logdata);
+      $dbh->commit;
+    }
     return ('FAIL', $msg);
   }

trunk/dns.cgi

@@ -691 +691 @@
       $page->param(id           => $webvar{id});
       fill_recdata();   # populate the form... er, mostly.
-      if ($config{log_failures}) {
-        if ($webvar{defrec} eq 'y') {
-          logaction(0, $session->param("username"), $webvar{parentid},
-                "Failed adding default record '$webvar{name} $typemap{$webvar{type}} $webvar{address}', TTL $webvar{ttl} ($msg)");
-        } else {
-          logaction($webvar{parentid}, $session->param("username"),
-                parentID($dbh, (id => $webvar{parentid}, type => 'domain', revrec => $webvar{revrec})),
-                "Failed adding record '$webvar{name} $typemap{$webvar{type}} $webvar{address}', TTL $webvar{ttl} ($msg)");
-        }
-      }
     }
 
@@ -725 +715 @@
     changepage(page => "reclist", errmsg => "You are not permitted to edit records", id => $webvar{parentid})
         unless ($permissions{admin} || $permissions{record_edit});
-
-#    # prevent out-of-domain records from getting added by appending the domain, or DOMAIN for default records
-#    my $pname = ($webvar{defrec} eq 'y' ? 'DOMAIN' : domainName($dbh,$webvar{parentid}));
-#    $webvar{name} =~ s/\.*$/\.$pname/ if $webvar{name} !~ /$pname$/;
 
     # get current/previous record info so we can log "updated 'foo A 1.2.3.4' to 'foo A 2.3.4.5'"
@@ -752 +738 @@
       $page->param(id           => $webvar{id});
       fill_recdata();
-      if ($config{log_failures}) {
-        if ($webvar{defrec} eq 'y') {
-          logaction(0, $session->param("username"), $webvar{parentid},
-                "Failed updating default record '$typemap{$webvar{type}} $webvar{name} $webvar{address}', TTL $webvar{ttl} ($msg)");
-        } else {
-          logaction($webvar{parentid}, $session->param("username"),
-                parentID($dbh, (id => $webvar{parentid}, type => 'domain', revrec => $webvar{revrec})),
-                "Failed updating record '$typemap{$webvar{type}} $webvar{name} $webvar{address}', TTL $webvar{ttl} ($msg)");
-        }
-      }
     }
   }