X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fannounce.pl;h=f2251530dbcd3b22707a7182a49a7e93ef91842f;hb=refs%2Fremotes%2Fserver%2Fnewprot2;hp=a7edb6c076cab7d84bcdd5cd78fb39138bd4258c;hpb=03691f94fb11cdce388f89cd81b474e3505912c8;p=spider.git

diff --git a/cmd/announce.pl b/cmd/announce.pl
index a7edb6c0..f2251530 100644
--- a/cmd/announce.pl
+++ b/cmd/announce.pl
@@ -19,29 +19,29 @@ my ($self, $line) = @_;
 my @f = split /\s+/, $line;
 return (1, $self->msg('e5')) if $self->remotecmd;
 return (1, $self->msg('e9')) if !@f;
+return (1, $self->msg('e28')) unless $self->registered;
 
 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;
+my $tonode = '*';
+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
@@ -49,15 +49,20 @@ $line =~ s/\^/:/og;
 
 my @bad;
 if (@bad = BadWords::check($line)) {
-	return (1, $self->msg('e17', @bad));
+	$self->badcount(($self->badcount||0) + @bad);
+	Log('DXCommand', "$self->{call} swore: $line");
+	Log('ann', $to, $from, "[to $from only] $line");
+	$self->send("To $to de $from <$t>: $line");
+	return (1, ());
 }
 
-return (1, $self->msg('dup')) if AnnTalk::dup($from, $toflag, $line);
+return (1, $self->msg('dup')) if $self->priv < 5 && AnnTalk::dup($from, $tonode, $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);
+if ($to ne "LOCAL") {
+	my $pc = DXProt::pc12($from, $line, $tonode, $sysopflag, 0);
+	DXProt::send_announce($main::me, $pc, $from, $tonode, $line, $sysopflag, $main::mycall, '0' );
+} else {
+	DXChannel::broadcast_list("To $to de $from ($t): $line\a", 'ann', undef, @locals);
 }
 
 return (1, ());