X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fannounce.pl;h=a7edb6c076cab7d84bcdd5cd78fb39138bd4258c;hb=1a882ec013f6758062bd4fc2d9a612ca7a2160d0;hp=6c66bcd027fcec77cf51b1fc0bd1cbbc4f76bdb2;hpb=d5b4190c36f130852973121042876af3c5642cd7;p=spider.git

diff --git a/cmd/announce.pl b/cmd/announce.pl
index 6c66bcd0..a7edb6c0 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,27 +26,36 @@ my $to;
 my $from = $self->call;
 my $t = ztime(time);
 my $tonode;
+my $toflag = '*';
 my $sysopflag;
 
 if ($sort eq "FULL") {
   $line =~ s/^$f[0]\s+//;    # remove it
-  $to = "ALL";
+  $to = "All";
 } elsif ($sort eq "SYSOP") {
   $line =~ s/^$f[0]\s+//;     # remove it
   @locals = map { $_->priv >= 5 ? $_ : () } @locals;
-  $to = "SYSOP";
+  $to = "Sysop";
   $sysopflag = '*';
 } elsif ($sort eq "LOCAL") {
   $line =~ s/^$f[0]\s+//;     # remove it
-  $to = "LOCAL";
+  $to = "Local";
 } else {
-  $to = "LOCAL";
+  $to = "Local";
+}
+
+# change ^ into : for transmission
+$line =~ s/\^/:/og;
+
+my @bad;
+if (@bad = BadWords::check($line)) {
+	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", @locals);
-if ($to ne "LOCAL") {
-  $line =~ s/\^//og;    # remove ^ characters!
+DXProt::broadcast_list("To $to de $from <$t>: $line", 'ann', undef, @locals);
+if ($to ne "Local") {
   my $pc = DXProt::pc12($from, $line, $tonode, $sysopflag, 0);
   DXProt::broadcast_ak1a($pc);
 }