Changeset 272 for trunk/dns.cgi

Timestamp:

03/09/12 18:03:29 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Checkpoint; update record mostly patched up for reverse records.
See #26

File:

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

trunk/dns.cgi

@@ -688 +688 @@
     $page->param(port           => $recdata->{port});
     $page->param(ttl            => $recdata->{ttl});
-    $page->param(typelist       => getTypelist($dbh, $webvar{revrec}, $webvar{type}));
+    $page->param(typelist       => getTypelist($dbh, $webvar{revrec}, $recdata->{type}));
 
   } elsif ($webvar{recact} eq 'update') {
@@ -695 +695 @@
         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$/;
+#    # 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'"
     my $oldrec = getRecLine($dbh, $webvar{defrec}, $webvar{revrec}, $webvar{id});
 
-    my ($code,$msg) = updateRec($dbh,$webvar{defrec},$webvar{id},
-        $webvar{name},$webvar{type},$webvar{address},$webvar{ttl},
+    my ($code,$msg) = updateRec($dbh,$webvar{defrec},$webvar{revrec},$webvar{id},$webvar{parentid},
+        \$webvar{name},\$webvar{type},\$webvar{address},$webvar{ttl},
         $webvar{distance},$webvar{weight},$webvar{port});
 
-    if ($code eq 'OK') {
-##fixme: retrieve old record info for full logging of change
+    if ($code eq 'OK' || $code eq 'WARN') {
+      my $restr;
       if ($webvar{defrec} eq 'y') {
-        my $restr = "Updated default record from '$oldrec->{host} $typemap{$oldrec->{type}} $oldrec->{val}', TTL $oldrec->{ttl}\n".
+        $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);
-        changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec}, resultmsg => $restr);
       } else {
-        my $restr = "Updated record from '$oldrec->{host} $typemap{$oldrec->{type}} $oldrec->{val}', TTL $oldrec->{ttl}\n".
+        $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"),
@@ -720 +719 @@
                         revrec => $webvar{revrec}, partype => 'group')),
                 $restr);
-        changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec}, resultmsg => $restr);
-      }
+      }
+      changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec},
+        revrec => $webvar{revrec}, resultmsg => $restr, warnmsg => ($code ne 'OK' ? $msg : ''));
     } else {
       $page->param(failed       => 1);
@@ -1808 +1808 @@
   # than set them locally everywhere.
   foreach my $sessme ('resultmsg','warnmsg','errmsg') {
-    if ($params{$sessme}) {
+    if (my $tmp = $params{$sessme}) {
+      $tmp =~ s|\n|<br />\n|g;
       $session->param($sessme, $params{$sessme});
       delete $params{$sessme};