X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fannounce.pl;h=f2251530dbcd3b22707a7182a49a7e93ef91842f;hb=134ff86ce9df4a188bfee84ce4ce8ae3682a6b7a;hp=703f19bd9fcd4378d9c815464c7b0c59b18e7e41;hpb=2a87ab5eed4ec910717298ccd4a85abb36149599;p=spider.git

diff --git a/cmd/announce.pl b/cmd/announce.pl
index 703f19bd..f2251530 100644
--- a/cmd/announce.pl
+++ b/cmd/announce.pl
@@ -26,9 +26,8 @@ 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
@@ -57,12 +56,13 @@ if (@bad = BadWords::check($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);
-DXChannel::broadcast_list("To $to de $from ($t): $line\a", 'ann', undef, @locals);
 if ($to ne "LOCAL") {
-  my $pc = DXProt::pc12($from, $line, $tonode, $sysopflag, 0);
-  DXChannel::broadcast_nodes($pc);
+	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, ());