X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fannounce.pl;h=9a1cbd376b2dcc13700351e14774867b939878e7;hb=fcabf1831276e7fd1db8eb16a4b6f220db6408e5;hp=703f19bd9fcd4378d9c815464c7b0c59b18e7e41;hpb=2a87ab5eed4ec910717298ccd4a85abb36149599;p=spider.git

diff --git a/cmd/announce.pl b/cmd/announce.pl
index 703f19bd..9a1cbd37 100644
--- a/cmd/announce.pl
+++ b/cmd/announce.pl
@@ -17,7 +17,7 @@
 
 my ($self, $line) = @_;
 my @f = split /\s+/, $line;
-return (1, $self->msg('e5')) if $self->remotecmd;
+return (1, $self->msg('e5')) if $self->remotecmd || $self->inscript;
 return (1, $self->msg('e9')) if !@f;
 return (1, $self->msg('e28')) unless $self->registered;
 
@@ -51,13 +51,13 @@ $line =~ s/\^/:/og;
 my @bad;
 if (@bad = BadWords::check($line)) {
 	$self->badcount(($self->badcount||0) + @bad);
-	Log('DXCommand', "$self->{call} swore: $line");
+	LogDbg('DXCommand', "$self->{call} swore: $line (with words:" . join(',', @bad) . ")");
 	Log('ann', $to, $from, "[to $from only] $line");
 	$self->send("To $to de $from <$t>: $line");
 	return (1, ());
 }
 
-return (1, $self->msg('dup')) if AnnTalk::dup($from, $toflag, $line);
+return (1, $self->msg('dup')) if $self->priv < 5 && AnnTalk::dup($from, $toflag, $line);
 Log('ann', $to, $from, $line);
 DXChannel::broadcast_list("To $to de $from ($t): $line\a", 'ann', undef, @locals);
 if ($to ne "LOCAL") {