X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUser.pm;h=e2efad560fac2a7c3ae1b04ae71692953dcd80ea;hb=e51d0aa9293d8821c285ff573906a032e959d0c0;hp=a8fb7788c2e5406081f190c600970479c0a0b68b;hpb=0e84728de35d2dadbb9d624614a471b68ae9eef6;p=spider.git

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index a8fb7788..e2efad56 100644
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -11,9 +11,11 @@ package DXUser;
 require Exporter;
 @ISA = qw(Exporter);
 
+use DXLog;
 use DB_File;
+use Data::Dumper;
 use Fcntl;
-use Carp;
+use DXDebug;
 
 use strict;
 use vars qw(%u $dbm $filename %valid);
@@ -42,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',
@@ -52,9 +54,15 @@ $filename = undef;
 		  wantbeep => '0,Rec Beep,yesno',
 		  wantann => '0,Rec Announce,yesno',
 		  wantwwv => '0,Rec WWV,yesno',
+		  wantwcy => '0,Rec WCY,yesno',
+		  wantecho => '0,Rec Echo,yesno',
 		  wanttalk => '0,Rec Talk,yesno',
 		  wantwx => '0,Rec WX,yesno',
 		  wantdx => '0,Rec DX Spots,yesno',
+		  pagelth => '0,Current Pagelth',
+		  pingint => '9,Node Ping interval',
+		  nopings => '9,Ping Obs Count',
+		  wantlogininfo => '9,Login info req,yesno',
 		 );
 
 no strict;
@@ -113,15 +121,15 @@ sub new
 	my $call = uc shift;
 	#  $call =~ s/-\d+$//o;
   
-	confess "can't create existing call $call in User\n!" if $u{$call};
+#	confess "can't create existing call $call in User\n!" if $u{$call};
 
 	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;
-	$u{call} = $self->encode();
+	$self->put;
 	return $self;
 }
 
@@ -175,6 +183,7 @@ sub get_current
 sub put
 {
 	my $self = shift;
+	confess "Trying to put nothing!" unless $self && ref $self;
 	my $call = $self->{call};
 	$u{$call} = $self->encode();
 }
@@ -185,27 +194,11 @@ sub put
 sub encode
 {
 	my $self = shift;
-	my $out;
-	my $f;
-
-	$out = "bless( { ";
-	for $f (sort keys %$self) {
-		my $val = $$self{$f};
-	    if (ref $val) {          # it's an array (we think)
-			$out .= "'$f'=>[ ";
-			foreach (@$val) {
-				my $s = $_;
-				$out .= "'$s',";
-			}
-			$out .= " ],";
-	    } else {
-			$val =~ s/'/\\'/og;
-			$val =~ s/\@/\\@/og;
-			$out .= "'$f'=>q{$val},";
-		}
-	}
-	$out .= " }, 'DXUser')";
-	return $out;
+	my $dd = new Data::Dumper([$self]);
+	$dd->Indent(0);
+	$dd->Terse(1);
+    $dd->Quotekeys($] < 5.005 ? 1 : 0);
+	return $dd->Dumpxs;
 }
 
 #
@@ -217,7 +210,8 @@ sub decode
 	my $ref;
 	$s = '$ref = ' . $s;
 	eval $s;
-	confess $@ if $@;
+	Log('DXUser', $@) if $@;
+	$ref = undef if $@;
 	return $ref;
 }
 
@@ -335,9 +329,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
@@ -355,6 +350,16 @@ sub wantwwv
 	return _want('wwv', @_);
 }
 
+sub wantwcy
+{
+	return _want('wcy', @_);
+}
+
+sub wantecho
+{
+	return _want('echo', @_);
+}
+
 sub wantwx
 {
 	return _want('wx', @_);
@@ -365,5 +370,70 @@ sub wantdx
 	return _want('dx', @_);
 }
 
+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;
+}
+
+sub is_node
+{
+	my $self = shift;
+	return $self->{sort} =~ /[ACRSX]/;
+}
+
+sub is_user
+{
+	my $self = shift;
+	return $self->{sort} eq 'U';
+}
+
+sub is_bbs
+{
+	my $self = shift;
+	return $self->{sort} eq 'B';
+}
+
+sub is_spider
+{
+	my $self = shift;
+	return $self->{sort} eq 'S';
+}
+
+sub is_clx
+{
+	my $self = shift;
+	return $self->{sort} eq 'C';
+}
+
+sub is_dxnet
+{
+	my $self = shift;
+	return $self->{sort} eq 'X';
+}
+
+sub is_arcluster
+{
+	my $self = shift;
+	return $self->{sort} eq 'R';
+}
+
+sub is_ak1a
+{
+	my $self = shift;
+	return $self->{sort} eq 'A';
+}
 1;
 __END__
+
+
+
+
+