X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fannounce.pl;h=d2755b2df46309014c1b657e717baa94376992f4;hb=c4f04ae165fdc765f3baa26fa2b28b52cf967674;hp=94b03a473009da82db0e89a8345df4a55f316c84;hpb=88665a2bed3b9ec9e97237938a95a045b2a21bb4;p=spider.git

diff --git a/cmd/announce.pl b/cmd/announce.pl
index 94b03a47..d2755b2d 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('e9')) if !@f;
 
 my $sort = uc $f[0];
@@ -26,6 +26,7 @@ my $to;
 my $from = $self->call;
 my $t = ztime(time);
 my $tonode;
+my $toflag = '*';
 my $sysopflag;
 
 if ($sort eq "FULL") {
@@ -46,13 +47,18 @@ 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);
+	return (1, $self->msg('e17', @bad));
+}
+
+return (1, $self->msg('dup')) if 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", '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, ());