X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=cmd%2Ftalk.pl;h=2d1fbb9ef27d402c1e441d2731951aa6c9d56a96;hb=19740220d324a319fb868ce34fb7bed7e31dd450;hp=4673392a0ca345fba3d28399b0b75982e2e691eb;hpb=c1a9cb4e04fb7db7898b05542e671c4e9e55fb93;p=spider.git

diff --git a/cmd/talk.pl b/cmd/talk.pl
index 4673392a..2d1fbb9e 100644
--- a/cmd/talk.pl
+++ b/cmd/talk.pl
@@ -3,7 +3,7 @@
 #
 # Copyright (c) 1998 Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 my ($self, $inline) = @_;
@@ -28,15 +28,21 @@ if ($via) {
 	($to, $line) = split /\s+/, $inline, 2;  
 }
 
-$to = uc $to if $to;
+return (1, $self->msg('e8')) unless $to;
+
+$to = uc $to;
+
+return (1, $self->msg('e5')) if $self->remotecmd || $self->inscript;
+return (1, $self->msg('e22', $to)) unless is_callsign($to);
+return (1, $self->msg('e28')) unless $self->registered || $to eq $main::myalias;
+
 $via = uc $via if $via;
-my $call = $via ? $via : $to;
+my $call = $via || $to;
 my $clref = Route::get($call);     # try an exact call
 my $dxchan = $clref->dxchan if $clref;
 #return (1, $self->msg('e7', $call)) unless $dxchan;
-return (1, $self->msg('e28')) unless $self->registered || $to eq $main::myalias;
 
-$DB::single = 1;
+#$DB::single = 1;
 
 # default the 'via'
 #$via ||= '*';
@@ -45,6 +51,7 @@ $DB::single = 1;
 # and set talk mode for command mode
 if ($line) {
 	my @bad;
+	Log('talk', $to, $from, '>' . ($via || ($dxchan && $dxchan->call) || '*'), $line);
 	if (@bad = BadWords::check($line)) {
 		$self->badcount(($self->badcount||0) + @bad);
 		LogDbg('DXCommand', "$self->{call} swore: $line (with words:" . join(',', @bad) . ")");
@@ -67,6 +74,7 @@ if ($line) {
 		push @out, $self->msg('talkinst');
 		$self->state('talk');
 	}
+	Log('talk', $to, $from, '>' . ($via || ($dxchan && $dxchan->call) || '*'), $self->msg('talkstart'));
 	push @out, $self->talk_prompt;
 }