X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Ftalk.pl;h=f21e2851bc90790891003b6a24cd43869147fe47;hb=d384410d4d5d1031cabab44350b80f2a55fe808d;hp=45ac857ee935bf7bb7fa7f142435f79da82edf5b;hpb=6624dcdf07d628e8d6a16fc6549edf40be25b7b2;p=spider.git

diff --git a/cmd/talk.pl b/cmd/talk.pl
index 45ac857e..f21e2851 100644
--- a/cmd/talk.pl
+++ b/cmd/talk.pl
@@ -34,15 +34,18 @@ my $call = $via ? $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;
 
 # if there is a line send it, otherwise add this call to the talk list
 # and set talk mode for command mode
 if ($line) {
 	my @bad;
 	if (@bad = BadWords::check($line)) {
-		return (1, $self->msg('e17', @bad));
+		$self->badcount(($self->badcount||0) + @bad);
+		Log('DXCommand', "$self->{call} swore: $line");
+	} else {
+		$dxchan->talk($self->call, $to, $via, $line) if $dxchan;
 	}
-	$dxchan->talk($self->call, $to, $via, $line) if $dxchan;
 } else {
 	my $s = $to;
 	$s .= ">$via" if $via;