X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUser.pm;h=3df7fc20b218e42a2afb90da8fa03d0dec82cbf7;hb=a472851a7e290dac262131fd7f73b567332df6e4;hp=e62123bfc1ef1a8235bb3c942b93f501db367f38;hpb=defc60f3e7fab9bb99d1c9f7b8bccc4ec37628d5;p=spider.git

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index e62123bf..3df7fc20 100644
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -75,7 +75,7 @@ $v3 = 0;
 		  pagelth => '0,Current Pagelth',
 		  pingint => '9,Node Ping interval',
 		  nopings => '9,Ping Obs Count',
-		  wantlogininfo => '9,Login info req,yesno',
+		  wantlogininfo => '0,Login Info Req,yesno',
           wantgrid => '0,Show DX Grid,yesno',
 		  wantann_talk => '0,Talklike Anns,yesno',
 		  wantpc90 => '1,Req PC90,yesno',
@@ -92,6 +92,8 @@ $v3 = 0;
 		  prompt => '0,Required Prompt',
 		  version => '1,Version',
 		  build => '1,Build',
+		  believe => '1,Believable nodes,parray',
+		  lastping => '1,Last Ping at,ptimelist',
 		 );
 
 #no strict;
@@ -262,7 +264,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};
@@ -480,16 +482,20 @@ 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; 
+				Log('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 $@;
@@ -592,6 +598,8 @@ sub sort
 }
 
 # some accessors
+
+# want is default = 1
 sub _want
 {
 	my $n = shift;
@@ -602,6 +610,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', @_);
@@ -662,6 +681,11 @@ sub wantpc16
 	return _want('pc16', @_);
 }
 
+sub wantpc90
+{
+	return _wantnot('pc90', @_);
+}
+
 sub wantsendpc16
 {
 	return _want('sendpc16', @_);
@@ -687,6 +711,11 @@ sub wantdxitu
 	return _want('dxitu', @_);
 }
 
+sub wantnp
+{
+	return _wantnot('np', @_);
+}
+
 sub wantlogininfo
 {
 	my $self = shift;
@@ -754,6 +783,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__