Changeset 286 for trunk/dns.cgi

Timestamp:

03/23/12 13:25:45 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Convert action logging for "Add reverse zone" to DNSDB-internal. See #35

• don't pass userdata, either in the upstream caller (dns.cgi) or internally to _log()
• don't expect userdata to be passed in

Fix up some warning-message-propagation in addRDNS()
Remove domain_id from addDomain() failure logging; if the domain wasn't
added then the log can't usefully refer to it by domain ID.
File off stale ##fixme's on reclist page
Fine-tune handling of message parameters in changepage(); if we're
going to go to the effort of converting newlines to <br> we should
use the result.

File:

• trunk/dns.cgi (modified) (3 diffs)

trunk/dns.cgi

@@ -489 +489 @@
 
   my ($code,$msg) = addRDNS($dbh, $webvar{revzone}, $webvar{revpatt}, $webvar{group},
-        ($webvar{makeactive} eq 'on' ? 1 : 0),
-        (username => $session->param("username"), id => $session->param("uid")) );
+        ($webvar{makeactive} eq 'on' ? 1 : 0));
 
   if ($code eq 'OK') {
-    logaction(0, $session->param("username"), $webvar{group}, "Added reverse zone $webvar{revzone}", $msg);
     changepage(page => "reclist", id => $msg, revrec => 'y');
+  } elsif ($code eq 'WARN') {
+    changepage(page => "reclist", id => $msg, revrec => 'y', warnmsg => $DNSDB::resultstr);
   } else {
-    logaction(0, $session->param("username"), $webvar{group}, "Failed adding reverse zone $webvar{revzone} ($msg)");
     $session->param('add_failed', 1);
     changepage(page => "newrevzone", revzone => $webvar{revzone}, revpatt => $webvar{revpatt}, errmsg => $msg);
@@ -602 +601 @@
     showzone($webvar{defrec}, $webvar{revrec}, $webvar{id});
     if ($webvar{defrec} eq 'n') {
-#      showzone('n',$webvar{id});
-##fixme:  permission for viewing logs?
-##fixme:  determine which slice of the log we view (group, domain, revzone)
       if ($webvar{revrec} eq 'n') {
         $page->param(logdom => 1);
@@ -1868 +1864 @@
   foreach my $sessme ('resultmsg','warnmsg','errmsg') {
     if (my $tmp = $params{$sessme}) {
+      $tmp =~ s/^\n//;
       $tmp =~ s|\n|<br />\n|g;
-      $session->param($sessme, $params{$sessme});
+      $session->param($sessme, $tmp);
       delete $params{$sessme};
     }