X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUser.pm;h=2357ec050d48cb52c1604b41f1a953cc6e3fef93;hb=f7ce6f45eae627c1368ffea0e1e56e84fec676be;hp=956957e8260f1218f8eebeacd677b76795f98ef4;hpb=bca5cd40374f12da5e0d46980e54bffc61fdc9c9;p=spider.git

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index 956957e8..2357ec05 100644
--- 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',
@@ -123,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;
@@ -326,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
@@ -363,7 +364,10 @@ sub wanttalk
 
 sub wantlogininfo
 {
-	return _want('logininfo', @_);
+	my $self = shift;
+	my $n = shift;
+	$self->{wantlogininfo} = $n if $n;
+	return exists $self->{wantlogininfo} ? $self->{wantlogininfo} : 0;
 }
 
 1;