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

diff --git a/cmd/talk.pl b/cmd/talk.pl
index 45ac857e..66d3cd2c 100644
--- a/cmd/talk.pl
+++ b/cmd/talk.pl
@@ -12,7 +12,7 @@ my $via;
 my $line;
 my $from = $self->call;
 my @out;
-return (1, $self->msg('e5')) if $self->remotecmd;
+return (1, $self->msg('e5')) if $self->remotecmd || $self->inscript;
 
 # analyse the line there are four situations...
 # 1) talk call
@@ -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);
+		LogDbg('DXCommand', "$self->{call} swore: $line (with words:" . join(',', @bad) . ")");
+	} 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;