Changeset 107 for trunk

Timestamp:

07/19/11 16:50:08 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix mishandling of record data retrieved before deleting said record.
Tweak logging on record deletion - probably failing due to

mishandling the retrieval.

Location:

trunk

Files:

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

trunk/DNSDB.pm

@@ -1033 +1033 @@
   delete $ret->{longrec_id};    # remove these since they shouldn't be exposed - the caller
   delete $ret->{recdata};       # should not care about "long records" vs normal ones.
+  $ret->{parid} = (($def eq 'def' or $def eq 'y') ? $ret->{group_id} : $ret->{domain_id});
 
   return $ret;

trunk/dns.cgi

@@ -449 +449 @@
   if (!defined($webvar{del})) {
     $page->param(del_getconf => 1);
-    my %rec = getRecLine($dbh,$webvar{defrec},$webvar{id});
-    $page->param(host => $rec{host});
-    $page->param(ftype => $typemap{$rec{type}});
-    $page->param(recval => $rec{val});
+    my $rec = getRecLine($dbh,$webvar{defrec},$webvar{id});
+    $page->param(host => $rec->{host});
+    $page->param(ftype => $typemap{$rec->{type}});
+    $page->param(recval => $rec->{val});
   } elsif ($webvar{del} eq 'ok') {
 # get rec data before we try to delete it
-    my %rec = getRecLine($dbh,$webvar{defrec},$webvar{id});
+    my $rec = getRecLine($dbh,$webvar{defrec},$webvar{id});
     my ($code,$msg) = delRec($dbh,$webvar{defrec},$webvar{id});
     if ($code ne 'OK') {
 ## need to find failure mode
       if ($webvar{defrec} eq 'y') {
-        logaction(0, $session->param("username"), $rec{parid},
-                "Failed deleting default record '$rec{host} $typemap{$rec{type}} $rec{val}', TTL $rec{ttl} ($msg)");
+        logaction(0, $session->param("username"), $rec->{parid},
+                "Failed deleting default record '$rec->{host} $typemap{$rec->{type}} $rec->{val}',".
+                " TTL $rec->{ttl} ($msg)");
       } else {
-        logaction($rec{parid}, $session->param("username"), parentID($rec{parid}, 'dom', 'group'),
-                "Failed deleting record '$rec{host} $typemap{$rec{type}} $rec{val}', TTL $rec{ttl} ($msg)");
+        logaction($rec->{parid}, $session->param("username"), parentID($rec->{parid}, 'dom', 'group'),
+                "Failed deleting record '$rec->{host} $typemap{$rec->{type}} $rec->{val}', TTL $rec->{ttl} ($msg)");
       }
       changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec},
@@ -473 +474 @@
     } else {
       if ($webvar{defrec} eq 'y') {
-        logaction(0, $session->param("username"), $rec{parid},
-                "Deleted default record '$rec{host} $typemap{$rec{type}} $rec{val}', TTL $rec{ttl}");
+        logaction(0, $session->param("username"), $rec->{parid},
+                "Deleted default record '$rec->{host} $typemap{$rec->{type}} $rec->{val}', TTL $rec->{ttl}");
       } else {
-        logaction($rec{parid}, $session->param("username"), parentID($rec{parid}, 'dom', 'group'),
-                "Deleted record '$rec{host} $typemap{$rec{type}} $rec{val}', TTL $rec{ttl}");
+        logaction($rec->{parid}, $session->param("username"), parentID($rec->{parid}, 'dom', 'group'),
+                "Deleted record '$rec->{host} $typemap{$rec->{type}} $rec->{val}', TTL $rec->{ttl}");
       }
       changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec});
@@ -1688 +1689 @@
 
   $sth = $dbh->prepare("INSERT INTO log (domain_id,user_id,group_id,email,name,entry) ".
-        "VALUES (?,?,?,?,?,?)");
-  $sth->execute($domid,$user_id,$groupid,$username,$fullname,$entry);
+        "VALUES (?,?,?,?,?,?)") or warn $dbh->errstr;
+  $sth->execute($domid,$user_id,$groupid,$username,$fullname,$entry) or warn $sth->errstr;
 } # end logaction()