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

diff --git a/cmd/announce.pl b/cmd/announce.pl
index cb2e325d..a7edb6c0 100644
--- a/cmd/announce.pl
+++ b/cmd/announce.pl
@@ -12,33 +12,51 @@
 #
 # $Id$
 #
+# Modified 13Dec98 Iain Phillips G0RDI
+#
 
 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];
 my @locals = DXCommandmode->get_all();
 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";
 } 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));
 }
 
-DXProt::broadcast_list("To $to de $from <$t>: $line", @locals);
-if ($to ne "LOCAL") {
-  $line =~ s/\^//og;    # remove ^ characters!
-  my $pc = DXProt::pc12($self, $line, $tonode, $sysopflag, 0);
+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") {
+  my $pc = DXProt::pc12($from, $line, $tonode, $sysopflag, 0);
   DXProt::broadcast_ak1a($pc);
 }