Changeset 488

Timestamp:

03/19/13 17:30:51 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Object conversion of DNSDB.pm, part 20. See #11.

• get rid of not-quite-global %userdata hash used for logging; if someone wants to use multiple DNSDB objects chances are they'll want to initialize them with separate users.

File:

• trunk/DNSDB.pm (modified) (4 diffs)

trunk/DNSDB.pm

@@ -175 +175 @@
 # it relies on visibility flags from the rectypes table in the DB
 my %validators;
-
-# Username, full name, ID - mainly for logging
-my %userdata;
 
 # Entity-relationship reference hashes.
@@ -378 +375 @@
         undef,
         ($args{domain_id}, $args{rdns_id}, $args{group_id}, $args{entry},
-                $userdata{userid}, $userdata{username}, $userdata{fullname}) );
+                $self->{loguserid}, $self->{logusername}, $self->{logfullname}) );
 #  } elsif ($config{log_channel} eq 'file') {
 #  } elsif ($config{log_channel} eq 'syslog') {
@@ -1488 +1485 @@
         " FROM users WHERE username=?", undef, ($args{username}) );
   }
-  %userdata = %{$tmpuser};
-  $userdata{lastname} = '' if !$userdata{lastname};
-  $userdata{fullname} = "$userdata{firstname} $userdata{lastname} ($args{rpcsys})";
+  $tmpuser->{lastname} = '' if !$tmpuser->{lastname};
+  $self->{loguserid} = $tmpuser->{userid};
+  $self->{logusername} = $tmpuser->{username};
+  $self->{logfullname} = "$tmpuser->{firstname} $tmpuser->{lastname} ($args{rpcsys})";
   return 1 if $tmpuser;
 } # end initRPC()
@@ -1549 +1547 @@
 ##fixme: errors are unpossible!
 
-  $userdata{username} = $username;
-  $userdata{userid} = $uid;
-  $userdata{fullname} = $fullname;
+  $self->{logusername} = $username;
+  $self->{loguserid} = $uid;
+  $self->{logfullname} = $fullname;
 
   # convert to real check once we have other logging channels