Changeset 288 for trunk/dns.cgi

Timestamp:

03/26/12 18:06:09 (12 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()

File:

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

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);