X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fannounce.pl;h=5e0ff58c998c4c1c440d3a6a66ac66d0698ae4e8;hb=27e78b3812d39874a6db249fda63f0e7b20dce71;hp=3b07d84ddec974639e6943c16b5ae0eb92c2640f;hpb=bbcb636f1bc71eb1426685ef64382ea42d27ecfb;p=spider.git

diff --git a/cmd/announce.pl b/cmd/announce.pl
index 3b07d84d..5e0ff58c 100644
--- a/cmd/announce.pl
+++ b/cmd/announce.pl
@@ -17,8 +17,9 @@
 
 my ($self, $line) = @_;
 my @f = split /\s+/, $line;
-return (1, $self->msg('e5')) if $self->remotecmd;
+return (1, $self->msg('e5')) if $self->remotecmd || $self->inscript;
 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();
@@ -56,9 +57,9 @@ 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, $toflag, $line);
 Log('ann', $to, $from, $line);
-DXChannel::broadcast_list("To $to de $from <$t>: $line", 'ann', undef, @locals);
+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);