mega-merge of major parts of mojo

[spider.git] / cmd / announce.pl

diff --git a/cmd/announce.pl b/cmd/announce.pl
index a3d3fd61718b10a184591041044c1eb9b6fb817a..9065993b78b02746726c3d62728279d6f248a8b9 100644 (file)
--- a/cmd/announce.pl
+++ b/cmd/announce.pl
@@ -10,16 +10,19 @@
 #
 # Copyright (c) 1998 Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 # Modified 13Dec98 Iain Phillips G0RDI
 #
 
 my ($self, $line) = @_;
+#$DB::single = 1;
+my $addr = $self->hostname || '127.0.0.1';
+Log('cmd', "$self->{call}|$addr|announce|$line");
 my @f = split /\s+/, $line;
 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;
+return (1, $self->msg('e28')) unless $self->isregistered;
 
 my $sort = uc $f[0];
 my $to = '*';
@@ -64,7 +67,7 @@ if ($drop) {
        return (1, ());
 }
 
-return (1, $self->msg('dup')) if $self->priv < 5 && AnnTalk::dup($from, $toflag, $line);
+#return (1, $self->msg('dup')) if $self->priv < 5 && AnnTalk::dup($from, $toflag, $line);
 Log('ann', $to, $from, $line);
 $main::me->normal(DXProt::pc93($to, $from, $via, $line));