X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUser.pm;h=bca3b1dab70c7ea8ed7b2d1b01dbd6c75728d7d5;hb=0791dd94e297b6c14167f4252b91f06e84fbcf6f;hp=f2abe8047e37b4cba0cc096802d02dd8f3545921;hpb=ae02a87834832860eb88eff1ee6dd40f3d814443;p=spider.git

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index f2abe804..bca3b1da 100644
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -61,7 +61,8 @@ $v3 = 0;
 		  annok => '9,Accept Announces?,yesno', # accept his announces?
 		  lang => '0,Language',
 		  hmsgno => '0,Highest Msgno',
-		  group => '0,Access Group,parray',	# used to create a group of users/nodes for some purpose or other
+		  group => '0,Group,parray',	# used to create a group of users/nodes for some purpose or other
+		  buddies => '0,Buddies,parray',
 		  isolate => '9,Isolate network,yesno',
 		  wantbeep => '0,Req Beep,yesno',
 		  wantann => '0,Req Announce,yesno',
@@ -75,20 +76,23 @@ $v3 = 0;
 		  pagelth => '0,Current Pagelth',
 		  pingint => '9,Node Ping interval',
 		  nopings => '9,Ping Obs Count',
-		  wantlogininfo => '9,Login info req,yesno',
-          wantgrid => '0,DX Grid Info,yesno',
+		  wantlogininfo => '0,Login Info Req,yesno',
+          wantgrid => '0,Show DX Grid,yesno',
 		  wantann_talk => '0,Talklike Anns,yesno',
-		  wantpc90 => '1,Req PC90,yesno',
-		  wantnp => '1,Req New Protocol,yesno',
 		  wantpc16 => '9,Want Users from node,yesno',
 		  wantsendpc16 => '9,Send PC16,yesno',
 		  wantroutepc19 => '9,Route PC19,yesno',
+		  wantusstate => '0,Show US State,yesno',
+		  wantdxcq => '0,Show CQ Zone,yesno',
+		  wantdxitu => '0,Show ITU Zone,yesno',
 		  lastoper => '9,Last for/oper,cldatetime',
 		  nothere => '0,Not Here Text',
 		  registered => '9,Registered?,yesno',
 		  prompt => '0,Required Prompt',
 		  version => '1,Version',
 		  build => '1,Build',
+		  believe => '1,Believable nodes,parray',
+		  lastping => '1,Last Ping at,ptimelist',
 		 );
 
 #no strict;
@@ -138,7 +142,7 @@ sub init
 
 		$ufn = "$fn.v3";
 		$v3 = 1;
-		$convert++ unless -e $ufn;
+		$convert++ if -e "$fn.v2" && !-e $ufn;
 	}
 	
 	if ($mode) {
@@ -147,10 +151,12 @@ sub init
 		$dbm = tie (%u, 'DB_File', $ufn, O_RDONLY, 0666, $DB_BTREE) or confess "can't open user file: $fn ($!) [rebuild it from user_asc?]";
 	}
 
+	die "Cannot open $ufn ($!)\n" unless $dbm;
+
 	$lru = LRU->newbase("DXUser", $lrusize);
 	
 	# do a conversion if required
-	if ($convert) {
+	if ($dbm && $convert) {
 		my ($key, $val, $action, $count, $err) = ('','',0,0,0);
 		
 		my %oldu;
@@ -207,17 +213,23 @@ sub finish
 # new - create a new user
 #
 
-sub new
+sub alloc
 {
 	my $pkg = shift;
 	my $call = uc shift;
+	my $self = bless {call => $call, 'sort'=>'U'}, $pkg;
+	return $self;
+}
+
+sub new
+{
+	my $pkg = shift;
+	my $call = shift;
 	#  $call =~ s/-\d+$//o;
   
 #	confess "can't create existing call $call in User\n!" if $u{$call};
 
-	my $self = bless {}, $pkg;
-	$self->{call} = $call;
-	$self->{'sort'} = 'U';
+	my $self = $pkg->alloc($call);
 	$self->put;
 	return $self;
 }
@@ -259,7 +271,7 @@ sub get_current
 	my $pkg = shift;
 	my $call = uc shift;
   
-	my $dxchan = DXChannel->get($call);
+	my $dxchan = DXChannel::get($call);
 	return $dxchan->user if $dxchan;
 	my $rref = Route::get($call);
 	return $rref->user if $rref && exists $rref->{user};
@@ -317,11 +329,7 @@ sub decode
 sub asc_encode
 {
 	my $self = shift;
-	my $dd = new Data::Dumper([$self]);
-	$dd->Indent(0);
-	$dd->Terse(1);
-    $dd->Quotekeys($] < 5.005 ? 1 : 0);
-	return $dd->Dumpxs;
+	return dd($self);
 }
 
 #
@@ -331,10 +339,10 @@ sub asc_decode
 {
 	my $s = shift;
 	my $ref;
+	$s =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
 	eval '$ref = ' . $s;
 	if ($@) {
-		dbg($@);
-		Log('err', $@);
+		LogDbg('err', $@);
 		$ref = undef;
 	}
 	return $ref;
@@ -477,20 +485,24 @@ print "There are $count user records and $err errors\n";
 
         for ($action = R_FIRST; !$dbm->seq($key, $val, $action); $action = R_NEXT) {
 			if (!is_callsign($key) || $key =~ /^0/) {
-				Log('DXCommand', "Export Error1: $key\t$val");
+				my $eval = $val;
+				my $ekey = $key;
+				$eval =~ s/([\%\x00-\x1f\x7f-\xff])/sprintf("%%%02X", ord($1))/eg; 
+				$ekey =~ s/([\%\x00-\x1f\x7f-\xff])/sprintf("%%%02X", ord($1))/eg; 
+				LogDbg('DXCommand', "Export Error1: $ekey\t$eval");
 				eval {$dbm->del($key)};
-				dbg(carp("Export Error1: $key\t$val\n$@")) if $@;
+				dbg(carp("Export Error1: $ekey\t$eval\n$@")) if $@;
 				++$err;
 				next;
 			}
 			my $ref = decode($val);
 			if ($ref) {
 				my $t = $ref->{lastin} || 0;
-				if ($main::systime > $t + $tooold) {
+				if ($ref->{sort} eq 'U' && !$ref->{priv} && $main::systime > $t + $tooold) {
 					unless ($ref->{lat} && $ref->{long} || $ref->{qth} || $ref->{qra}) {
 						eval {$dbm->del($key)};
 						dbg(carp("Export Error2: $key\t$val\n$@")) if $@;
-						Log('DXCommand', "$ref->{call} deleted, too old");
+						LogDbg('DXCommand', "$ref->{call} deleted, too old");
 						$del++;
 						next;
 					}
@@ -499,7 +511,7 @@ print "There are $count user records and $err errors\n";
 				print $fh "$key\t" . $ref->asc_encode . "\n";
 				++$count;
 			} else {
-				Log('DXCommand', "Export Error3: $key\t$val");
+				LogDbg('DXCommand', "Export Error3: $key\t$val");
 				eval {$dbm->del($key)};
 				dbg(carp("Export Error3: $key\t$val\n$@")) if $@;
 				++$err;
@@ -571,6 +583,13 @@ sub new_group
 	$self->{group} = [ 'local' ];
 }
 
+# set up empty buddies (only happens for them's that connect direct)
+sub new_buddies
+{
+	my $self = shift;
+	$self->{buddies} = [  ];
+}
+
 #
 # return a prompt for a field
 #
@@ -589,6 +608,8 @@ sub sort
 }
 
 # some accessors
+
+# want is default = 1
 sub _want
 {
 	my $n = shift;
@@ -599,6 +620,17 @@ sub _want
 	return exists $self->{$s} ? $self->{$s} : 1;
 }
 
+# wantnot is default = 0
+sub _wantnot
+{
+	my $n = shift;
+	my $self = shift;
+	my $val = shift;
+	my $s = "want$n";
+	$self->{$s} = $val if defined $val;
+	return exists $self->{$s} ? $self->{$s} : 0;
+}
+
 sub wantbeep
 {
 	return _want('beep', @_);
@@ -669,6 +701,21 @@ sub wantroutepc16
 	return _want('routepc16', @_);
 }
 
+sub wantusstate
+{
+	return _want('usstate', @_);
+}
+
+sub wantdxcq
+{
+	return _want('dxcq', @_);
+}
+
+sub wantdxitu
+{
+	return _want('dxitu', @_);
+}
+
 sub wantlogininfo
 {
 	my $self = shift;
@@ -683,6 +730,12 @@ sub is_node
 	return $self->{sort} =~ /[ACRSX]/;
 }
 
+sub is_local_node
+{
+	my $self = shift;
+	return grep $_ eq 'local_node', @{$self->{group}};
+}
+
 sub is_user
 {
 	my $self = shift;
@@ -736,6 +789,41 @@ sub unset_passphrase
 	my $self = shift;
 	delete $self->{passphrase};
 }
+
+sub set_believe
+{
+	my $self = shift;
+	my $call = uc shift;
+	$self->{believe} ||= [];
+	push @{$self->{believe}}, $call unless grep $_ eq $call, @{$self->{believe}};
+}
+
+sub unset_believe
+{
+	my $self = shift;
+	my $call = uc shift;
+	if (exists $self->{believe}) {
+		$self->{believe} = [grep {$_ ne $call} @{$self->{believe}}];
+		delete $self->{believe} unless @{$self->{believe}};
+	}
+}
+
+sub believe
+{
+	my $self = shift;
+	return exists $self->{believe} ? @{$self->{believe}} : ();
+}
+
+sub lastping
+{
+	my $self = shift;
+	my $call = shift;
+	$self->{lastping} ||= {};
+	$self->{lastping} = {} unless ref $self->{lastping};
+	my $b = $self->{lastping};
+	$b->{$call} = shift if @_;
+	return $b->{$call};	
+}
 1;
 __END__