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

diff --git a/cmd/announce.pl b/cmd/announce.pl
index cb2e325d..b839e9c7 100644
--- a/cmd/announce.pl
+++ b/cmd/announce.pl
@@ -12,9 +12,14 @@
 #
 # $Id$
 #
+# Modified 13Dec98 Iain Phillips G0RDI
+#
 
 my ($self, $line) = @_;
 my @f = split /\s+/, $line;
+
+return (1, $self->msg('e9')) if !@f;
+
 my $sort = uc $f[0];
 my @locals = DXCommandmode->get_all();
 my $to;
@@ -31,14 +36,20 @@ if ($sort eq "FULL") {
   @locals = map { $_->priv >= 5 ? $_ : () } @locals;
   $to = "SYSOP";
   $sysopflag = '*';
-} else {
+} elsif ($sort eq "LOCAL") {
+  $line =~ s/^$f[0]\s+//;     # remove it
+  $to = "LOCAL";
+} elsif ($sort eq "") {
   $to = "LOCAL";
+} else {
+  return (1, $self->msg('e11'));
 }
 
+Log('ann', $to, $from, $line);
 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);
+  my $pc = DXProt::pc12($from, $line, $tonode, $sysopflag, 0);
   DXProt::broadcast_ak1a($pc);
 }