Changeset 288

Timestamp:

03/26/12 18:06:09 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Move action logging for updateRec() into DNSDB.pm.
Fix lurking bug in update that reset distance/weight/port to 0
Rearrange log/resultstring entry in addRec() for more consistent
order of fields, also to match ordering in updateRec()

Location:

trunk

Files:

• DNSDB.pm (modified) (4 diffs)
• dns.cgi (modified) (1 diff)

trunk/DNSDB.pm

@@ -2515 +2515 @@
                 (id => $id, type => ($revrec eq 'n' ? 'domain' : 'revzone'), revrec => $revrec) )
         if $defrec eq 'n';
-  $logdata{entry} = "Added ".($defrec eq 'y' ? 'default record' : 'record')." '$$host $typemap{$$rectype}";
+  $logdata{entry} = "Added ".($defrec eq 'y' ? 'default record' : 'record')." '$$host $typemap{$$rectype} $$val";
   $logdata{entry} .= " [distance $dist]" if $typemap{$$rectype} eq 'MX';
   $logdata{entry} .= " [priority $dist] [weight $weight] [port $port]"
         if $typemap{$$rectype} eq 'SRV';
-  $logdata{entry} .= " $$val', TTL $ttl";
+  $logdata{entry} .= "', TTL $ttl";
 
   # Allow transactions, and raise an exception on errors so we can catch it later.
@@ -2584 +2584 @@
 
   # only MX and SRV will use these
-  my $dist = 0;
-  my $weight = 0;
-  my $port = 0;
+  my $dist = shift || 0;
+  my $weight = shift || 0;
+  my $port = shift || 0;
 
   my $fields;
@@ -2631 +2631 @@
   $fields .= "=?";
 
+  # Put together the success log entry.  Horrible kludge from addRec() copied as-is since
+  # we don't know whether the passed arguments or retrieved values for domain_id and rdns_id
+  # will be maintained (due to "not-in-zone" validation changes)
+  my %logdata;
+  my @ftmp = split /,/, $fields;
+  for (my $i=0; $i <= $#vallist; $i++) {
+    $logdata{domain_id} = $vallist[$i] if $ftmp[$i] eq 'domain_id';
+    $logdata{rdns_id} = $vallist[$i] if $ftmp[$i] eq 'rdns_id';
+  }
+  $logdata{group_id} = $parid if $defrec eq 'y';
+  $logdata{group_id} = parentID($dbh,
+                (id => $parid, type => ($revrec eq 'n' ? 'domain' : 'revzone'), revrec => $revrec) )
+        if $defrec eq 'n';
+  $logdata{entry} = "Updated ".($defrec eq 'y' ? 'default record' : 'record')." from\n".
+        "'$oldrec->{host} $typemap{$oldrec->{type}} $oldrec->{val}";
+  $logdata{entry} .= " [distance $oldrec->{distance}]" if $typemap{$oldrec->{type}} eq 'MX';
+  $logdata{entry} .= " [priority $oldrec->{distance}] [weight $oldrec->{weight}] [port $oldrec->{port}]"
+        if $typemap{$oldrec->{type}} eq 'SRV';
+  $logdata{entry} .= "', TTL $oldrec->{ttl}\nto\n'$$host $typemap{$$rectype} $$val";
+  $logdata{entry} .= " [distance $dist]" if $typemap{$$rectype} eq 'MX';
+  $logdata{entry} .= " [priority $dist] [weight $weight] [port $port]" if $typemap{$$rectype} eq 'SRV';
+  $logdata{entry} .= "', TTL $ttl";
+
   local $dbh->{AutoCommit} = 0;
   local $dbh->{RaiseError} = 1;
@@ -2636 +2659 @@
   eval {
     $dbh->do("UPDATE "._rectable($defrec,$revrec)." SET $fields WHERE record_id=?", undef, (@vallist, $id) );
+    _log($dbh, %logdata);
     $dbh->commit;
   };
   if ($@) {
     my $msg = $@;
-    $dbh->rollback;
+    eval { $dbh->rollback; };
     return ('FAIL', $msg);
   }
 
+  $resultstr = $logdata{entry};
   return ($retcode, $retmsg);
 } # end updateRec()

trunk/dns.cgi

@@ -738 +738 @@
 
     if ($code eq 'OK' || $code eq 'WARN') {
-      my $restr;
-      if ($webvar{defrec} eq 'y') {
-        $restr = "Updated default record from '$oldrec->{host} $typemap{$oldrec->{type}} $oldrec->{val}', TTL $oldrec->{ttl}\n".
-                "to '$webvar{name} $typemap{$webvar{type}} $webvar{address}', TTL $webvar{ttl}";
-        logaction(0, $session->param("username"), $webvar{parentid}, $restr);
-      } else {
-        $restr = "Updated record from '$oldrec->{host} $typemap{$oldrec->{type}} $oldrec->{val}', TTL $oldrec->{ttl}\n".
-                "to '$webvar{name} $typemap{$webvar{type}} $webvar{address}', TTL $webvar{ttl}";
-        logaction($webvar{parentid}, $session->param("username"),
-                parentID($dbh, (id => $webvar{id}, type => 'record', defrec => $webvar{defrec},
-                        revrec => $webvar{revrec}, partype => 'group')),
-                $restr);
-      }
-      changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec},
-        revrec => $webvar{revrec}, resultmsg => $restr, warnmsg => ($code ne 'OK' ? $msg : ''));
+      my %pageparams = (page => "reclist", id => $webvar{parentid},
+        defrec => $webvar{defrec}, revrec => $webvar{revrec});
+      $pageparams{warnmsg} = $msg."<br><br>\n".$DNSDB::resultstr if $code eq 'WARN';
+      $pageparams{resultmsg} = $DNSDB::resultstr if $code eq 'OK';
+      changepage(%pageparams);
     } else {
       $page->param(failed       => 1);