Changeset 193 for trunk

Timestamp:

12/09/11 17:56:27 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Hack _log() to dig up user data when (not if) it's missing. Better solution needed.
Clean up debugging statements in addDomain()
Add some ##fixme's to dns.cgi
Log distance, port, weight as needed for new MX, SRV records

Location:

trunk

Files:

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

trunk/DNSDB.pm

@@ -488 +488 @@
 # Internal sub
 # Takes a database handle, domain_id, user_id, group_id, email, name and log entry
+##fixme:  convert to trailing hash for user info
+# User info must contain a (user ID OR username)+fullname
 sub _log {
   my $dbh = shift;
   my ($domain_id,$user_id,$group_id,$username,$name,$entry) = @_;
+
+##fixme:  need better way(s?) to snag userinfo for log entries.  don't want to have
+# to pass around yet *another* constant (already passing $dbh, shouldn't need to)
+  if (!$user_id) {
+    $user_id, $fullname) = $dbh->fetchrow_array("SELECT user_id, firstname || ' ' || lastname FROM users".
+        " WHERE username=?", undef, ($username));
+  } elsif (!$username) {
+    $username, $fullname) = $dbh->fetchrow_array("SELECT username, firstname || ' ' || lastname FROM users".
+        " WHERE user_id=?", undef, ($user_id));
+  }
+
+  $name = $fullname if !$name;
 
 ##fixme:  farm out the actual logging to different subs for file, syslog, internal, etc based on config
@@ -546 +560 @@
   local $dbh->{RaiseError} = 1;
 
-my $stage = 'insert';
   # Wrap all the SQL in a transaction
   eval {
     # insert the domain...
     $dbh->do("INSERT INTO domains (domain,group_id,status) VALUES (?,?,?)", undef, ($domain, $group, $state));
-$stage = 'domid';
 
     # get the ID...
     ($dom_id) = $dbh->selectrow_array("SELECT domain_id FROM domains WHERE domain=?", undef, ($domain));
 
-$stage = 'loginsert';
     _log($dbh, $dom_id, $userinfo{id}, $group, $userinfo{name}, $userinfo{fullname},
         "Added ".($state ? 'active' : 'inactive')." domain $domain");
 
-$stage = 'getdefrec';
     # ... and now we construct the standard records from the default set.  NB:  group should be variable.
     my $sth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl FROM default_records WHERE group_id=?");
@@ -592 +602 @@
     my $msg = $@;
     eval { $dbh->rollback; };
-    return ('FAIL',"$msg : $stage");
+    return ('FAIL',$msg);
   } else {
     return ('OK',$dom_id);

trunk/dns.cgi

@@ -347 +347 @@
 
   if ($code eq 'OK') {
-    logaction($msg, $session->param("username"), $webvar{group}, "Added domain $webvar{domain}");
+#    logaction($msg, $session->param("username"), $webvar{group}, "Added domain $webvar{domain}");
     changepage(page => "reclist", id => $msg);
   } else {
@@ -519 +519 @@
     if ($code eq 'OK') {
       if ($webvar{defrec} eq 'y') {
-        my $restr = "Added default record '$webvar{name} $typemap{$webvar{type}} $webvar{address}', TTL $webvar{ttl}";
+        my $restr = "Added default record '$webvar{name} $typemap{$webvar{type}}";
+        $restr .= " [distance $dist]" if $typemap{$webvar{type}} eq 'MX';
+        $restr .= " [priority $dist] [weight $weight] [port $port]" if $typemap{$webvar{type}} eq 'SRV';
+        $restr .= " $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 = "Added record '$webvar{name} $typemap{$webvar{type}} $webvar{address}', TTL $webvar{ttl}";
+        my $restr = "Added record '$webvar{name} $typemap{$webvar{type}}".
+        $restr .= " [distance $dist]" if $typemap{$webvar{type}} eq 'MX';
+        $restr .= " [priority $dist] [weight $weight] [port $port]" if $typemap{$webvar{type}} eq 'SRV';
+        $restr .= " $webvar{address}', TTL $webvar{ttl}";
         logaction($webvar{parentid}, $session->param("username"), parentID($webvar{parentid}, 'dom', 'group'), $restr);
         changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec}, resultmsg => $restr);
@@ -582 +588 @@
 
     if ($code eq 'OK') {
+##fixme: retrieve old record info for full logging of change
       if ($webvar{defrec} eq 'y') {
         my $restr = "Updated default record from '$oldrec->{host} $typemap{$oldrec->{type}} $oldrec->{val}', TTL $oldrec->{ttl}\n".