get all the debugging finally into the debug files when things go wrong

[spider.git] / perl / DXUser.pm

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index 58cb1afcabf39b5abd6c4ab0f2d4483a2d41fcd0..2357ec050d48cb52c1604b41f1a953cc6e3fef93 100644 (file)
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -15,7 +15,7 @@ use DXLog;
 use DB_File;
 use Data::Dumper;
 use Fcntl;
-use Carp;
+use DXDebug;
 
 use strict;
 use vars qw(%u $dbm $filename %valid);
@@ -44,8 +44,8 @@ $filename = undef;
                  node => '0,Last Node',
                  homenode => '0,Home Node',
                  lockout => '9,Locked out?,yesno',     # won't let them in at all
-                 dxok => '9,DX Spots?,yesno', # accept his dx spots?
-                 annok => '9,Announces?,yesno', # accept his announces?
+                 dxok => '9,Accept DX Spots?,yesno', # accept his dx spots?
+                 annok => '9,Accept Announces?,yesno', # accept his announces?
                  reg => '0,Registered?,yesno', # is this user registered?
                  lang => '0,Language',
                  hmsgno => '0,Highest Msgno',
@@ -58,6 +58,8 @@ $filename = undef;
                  wantwx => '0,Rec WX,yesno',
                  wantdx => '0,Rec DX Spots,yesno',
                  pingint => '9,Node Ping interval',
+                 nopings => '9,Ping Obs Count',
+                 wantlogininfo => '9,Login info req,yesno',
                 );
 
 no strict;
@@ -121,8 +123,8 @@ sub new
        my $self = bless {}, $pkg;
        $self->{call} = $call;
        $self->{'sort'} = 'U';
-       $self->{dxok} = 1;
-       $self->{annok} = 1;
+       $self->{dxok} = '1';
+       $self->{annok} = '1';
        $self->{lang} = $main::lang;
        $self->put;
        return $self;
@@ -192,7 +194,7 @@ sub encode
        my $dd = new Data::Dumper([$self]);
        $dd->Indent(0);
        $dd->Terse(1);
-    $dd->Quotekeys(0);
+    $dd->Quotekeys($] < 5.005 ? 1 : 0);
        return $dd->Dumpxs;
 }
 
@@ -324,9 +326,10 @@ sub _want
 {
        my $n = shift;
        my $self = shift;
+       my $val = shift;
        my $s = "want$n";
-       return $self->{$n} = shift if @_;
-       return defined $self->{$n} ? $self->{$n} : 1;
+       $self->{$s} = $val if defined $val;
+       return exists $self->{$s} ? $self->{$s} : 1;
 }
 
 sub wantbeep
@@ -359,5 +362,13 @@ sub wanttalk
        return _want('talk', @_);
 }
 
+sub wantlogininfo
+{
+       my $self = shift;
+       my $n = shift;
+       $self->{wantlogininfo} = $n if $n;
+       return exists $self->{wantlogininfo} ? $self->{wantlogininfo} : 0;
+}
+
 1;
 __END__