X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fannounce.pl;h=6b66d68eb9947dfb2c181bdac6bfb0d1863e1abb;hb=782ad549b29a1efec023ebcde840073a4676d8e8;hp=0ea2e12fdf8bbcf8369d75bb59f8be724a91f3e8;hpb=50f6466ca2dff82ca470a4abe327d741cffef61a;p=spider.git

diff --git a/cmd/announce.pl b/cmd/announce.pl
index 0ea2e12f..6b66d68e 100644
--- a/cmd/announce.pl
+++ b/cmd/announce.pl
@@ -19,6 +19,7 @@ my ($self, $line) = @_;
 my @f = split /\s+/, $line;
 return (1, $self->msg('e5')) if $self->remotecmd;
 return (1, $self->msg('e9')) if !@f;
+return (1, $self->msg('e28')) unless $self->registered;
 
 my $sort = uc $f[0];
 my @locals = DXCommandmode->get_all();
@@ -49,12 +50,16 @@ $line =~ s/\^/:/og;
 
 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");
+	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", 'ann', undef, @locals);
+DXChannel::broadcast_list("To $to de $from ($t): $line\a", 'ann', undef, @locals);
 if ($to ne "LOCAL") {
   my $pc = DXProt::pc12($from, $line, $tonode, $sysopflag, 0);
   DXChannel::broadcast_nodes($pc);