Changeset 284

Timestamp:

03/22/12 16:38:06 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Clean up dangling failure logging in the UI layer for add domain.
Also clean up interim userdata-passing that's no longer necessary.
See #35

Location:

trunk

Files:

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

trunk/DNSDB.pm

@@ -1293 +1293 @@
     ($dom_id) = $dbh->selectrow_array("SELECT domain_id FROM domains WHERE domain=?", undef, ($domain));
 
-    _log($dbh, (domain_id => $dom_id, user_id => $userinfo{id}, group_id => $group, username => $userinfo{username},
+    _log($dbh, (domain_id => $dom_id, group_id => $group,
         entry => "Added ".($state ? 'active' : 'inactive')." domain $domain"));
 
@@ -1308 +1308 @@
         my @tmp1 = split /:/, $host;
         my @tmp2 = split /:/, $val;
-        _log($dbh, (domain_id => $dom_id, user_id => $userinfo{id}, group_id => $group,
-                username => $userinfo{username}, entry =>
-                "[new $domain] Added SOA record [contact $tmp1[0]] [master $tmp1[1]] ".
+        _log($dbh, (domain_id => $dom_id, group_id => $group,
+                entry => "[new $domain] Added SOA record [contact $tmp1[0]] [master $tmp1[1]] ".
                 "[refresh $tmp2[0]] [retry $tmp2[1]] [expire $tmp2[2]] [minttl $tmp2[3]], TTL $ttl"));
       } else {
@@ -1316 +1315 @@
         $logentry .= " [distance $dist]" if $typemap{$type} eq 'MX';
         $logentry .= " [priority $dist] [weight $weight] [port $port]" if $typemap{$type} eq 'SRV';
-        _log($dbh, (domain_id => $dom_id, user_id => $userinfo{id}, group_id => $group,
-                username => $userinfo{username}, entry =>
-                $logentry." $val', TTL $ttl"));
+        _log($dbh, (domain_id => $dom_id, group_id => $group,
+                entry => $logentry." $val', TTL $ttl"));
       }
     }
@@ -1329 +1327 @@
     my $msg = $@;
     eval { $dbh->rollback; };
+    _log($dbh, (domain_id => $dom_id, group_id => $group, entry => "Failed adding domain $domain ($msg)"))
+        if $config{log_failures};
+    $dbh->commit;       # since we enabled transactions earlier
     return ('FAIL',$msg);
   } else {

trunk/dns.cgi

@@ -389 +389 @@
     changepage(page => "reclist", id => $msg);
   } else {
-    logaction(0, $session->param("username"), $webvar{group}, "Failed adding domain $webvar{domain} ($msg)")
-        if $config{log_failures};
     $session->param('add_failed', 1);
 ##fixme:  domain a security risk for XSS?