X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fannounce.pl;h=6b66d68eb9947dfb2c181bdac6bfb0d1863e1abb;hb=bccf827cfc80f9871efc8a25f9bb69f99c771d77;hp=494cd9ddfaa3c9c5179d418ea21b5c38e9c321e9;hpb=329702a31bd4a526077c713b12ede457276c79db;p=spider.git

diff --git a/cmd/announce.pl b/cmd/announce.pl
index 494cd9dd..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();
@@ -26,6 +27,7 @@ my $to;
 my $from = $self->call;
 my $t = ztime(time);
 my $tonode;
+my $toflag = '*';
 my $sysopflag;
 
 if ($sort eq "FULL") {
@@ -46,13 +48,21 @@ if ($sort eq "FULL") {
 # change ^ into : for transmission
 $line =~ s/\^/:/og;
 
-return (1, $self->msg('dup')) if AnnTalk::dup($from, $to, $line);
+my @bad;
+if (@bad = BadWords::check($line)) {
+	$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 $self->priv < 5 && AnnTalk::dup($from, $toflag, $line);
 Log('ann', $to, $from, $line);
-DXProt::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") {
-  $line =~ s/\^//og;    # remove ^ characters!
   my $pc = DXProt::pc12($from, $line, $tonode, $sysopflag, 0);
-  DXProt::broadcast_ak1a($pc);
+  DXChannel::broadcast_nodes($pc);
 }
 
 return (1, ());