X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=72d65cb316ebd05d0d36d76fd7330bcfd7a28d50;hb=bb8879b9edc81909ffc6880fd182f79b3bd23383;hp=4eca6e74abfc930b6c7408bc5d453be1f2e7b2b2;hpb=87ebd761d9a6b3d96c88d81109ef0a51293e8a2e;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 4eca6e74..72d65cb3 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -81,6 +81,12 @@ sub start
 	$self->{logininfo} = $user->wantlogininfo;
 	$self->{here} = 1;
 
+	# get the filters
+	$self->{spotsfilter} = Filter::read_in('spots', $call, 0) || Filter::read_in('spots', 'user_default', 0);
+	$self->{wwvfilter} = Filter::read_in('wwv', $call, 0) || Filter::read_in('wwv', 'user_default', 0);
+	$self->{wcyfilter} = Filter::read_in('wcy', $call, 0) || Filter::read_in('wcy', 'user_default', 0);
+	$self->{annfilter} = Filter::read_in('ann', $call, 0) || Filter::read_in('ann', 'user_default', 0) ;
+
 	# clean up qra locators
 	my $qra = $user->qra;
 	$qra = undef if ($qra && !DXBearing::is_qra($qra));
@@ -258,7 +264,7 @@ sub send_ans
 			$line =~ s/\s+$//o;	# why am having to do this? 
 			$self->send($line);
 		}
-		$self->{pagedata} =  \@_;
+		$self->{pagedata} =  [ @_ ];
 		$self->state('page');
 		$self->send($self->msg('page', scalar @_));
 	} else {
@@ -395,10 +401,10 @@ sub finish
 		sleep(1);
 	}
 
-	if ($call eq $main::myalias) { # unset the channel if it is us really
-		my $node = DXNode->get($main::mycall);
-		$node->{dxchan} = 0;
-	}
+#	if ($call eq $main::myalias) { # unset the channel if it is us really
+#		my $node = DXNode->get($main::mycall);
+#		$node->{dxchan} = 0;
+#	}
 	
 	# issue a pc17 to everybody interested
 	my $nchan = DXChannel->get($main::mycall);
@@ -630,7 +636,7 @@ sub talk
 {
 	my ($self, $from, $to, $via, $line) = @_;
 	$line =~ s/\\5E/\^/g;
-	$self->send("$to de $from $line") if $self->{talk};
+	$self->send("$to de $from: $line") if $self->{talk};
 	Log('talk', $to, $from, $main::mycall, $line);
 }