X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fannounce.pl;h=df7b91d0f54b7913ff423ae64a5981c6e9cf661d;hb=8a43bfdeacbbc78d0ff70df35528f78be39e7485;hp=b839e9c75bc2dd5169cff4f820e549ce17f410a0;hpb=bd23bedbdb72ae107893f94c7eabcfe18867fb41;p=spider.git

diff --git a/cmd/announce.pl b/cmd/announce.pl
index b839e9c7..df7b91d0 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") {
@@ -39,16 +40,22 @@ if ($sort eq "FULL") {
 } elsif ($sort eq "LOCAL") {
   $line =~ s/^$f[0]\s+//;     # remove it
   $to = "LOCAL";
-} elsif ($sort eq "") {
-  $to = "LOCAL";
 } else {
-  return (1, $self->msg('e11'));
+  $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);
+DXProt::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);
 }