fix sh/dx properly both for freq range and adding a . to the end of

[spider.git] / cmd / announce.pl

diff --git a/cmd/announce.pl b/cmd/announce.pl
index 94b03a473009da82db0e89a8345df4a55f316c84..a7edb6c076cab7d84bcdd5cd78fb39138bd4258c 100644 (file)
--- 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,31 +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;
 
-return (1, $self->msg('dup')) if AnnTalk::dup($from, $to, $line);
+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", 'ann', undef, @locals);
-if ($to ne "LOCAL") {
-  $line =~ s/\^//og;    # remove ^ characters!
+if ($to ne "Local") {
   my $pc = DXProt::pc12($from, $line, $tonode, $sysopflag, 0);
   DXProt::broadcast_ak1a($pc);
 }