Changeset 259

Timestamp:

03/02/12 17:19:06 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

More fixing on _log() and its callers and its caller's information
sources - general logic and behaviour cleanup this time

Location:

trunk

Files:

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

trunk/DNSDB.pm

@@ -1020 +1020 @@
     ($args{user_id}, $fullname) = $dbh->selectrow_array("SELECT user_id, firstname || ' ' || lastname FROM users".
         " WHERE username=?", undef, ($args{username}));
-  } elsif (!$args{username}) {
+  }
+  if (!$args{username}) {
     ($args{username}, $fullname) = $dbh->selectrow_array("SELECT username, firstname || ' ' || lastname FROM users".
         " WHERE user_id=?", undef, ($args{user_id}));
-  } else {
+  }
+  if (!$args{fullname}) {
     ($fullname) = $dbh->selectrow_array("SELECT firstname || ' ' || lastname FROM users".
         " WHERE user_id=?", undef, ($args{user_id}));
@@ -1092 +1094 @@
     ($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{name},
-                name => $userinfo{fullname}, entry => "Added ".($state ? 'active' : 'inactive')." domain $domain"));
+    _log($dbh, (domain_id => $dom_id, user_id => $userinfo{id}, group_id => $group, username => $userinfo{username},
+        entry => "Added ".($state ? 'active' : 'inactive')." domain $domain"));
 
     # ... and now we construct the standard records from the default set.  NB:  group should be variable.
@@ -1108 +1110 @@
         my @tmp2 = split /:/, $val;
         _log($dbh, (domain_id => $dom_id, user_id => $userinfo{id}, group_id => $group,
-                username => $userinfo{name}, name => $userinfo{fullname}, entry =>
+                username => $userinfo{username}, 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"));
@@ -1116 +1118 @@
         $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{name}, name => $userinfo{fullname}, entry =>
+                username => $userinfo{username}, entry =>
                 $logentry." $val', TTL $ttl"));
       }

trunk/dns.cgi

@@ -369 +369 @@
 
   my ($code,$msg) = addDomain($dbh,$webvar{domain},$webvar{group},($webvar{makeactive} eq 'on' ? 1 : 0),
-        (name => $session->param("username"), id => $session->param("uid")));
+        (username => $session->param("username"), id => $session->param("uid")));
 
   if ($code eq 'OK') {