projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make all the subsidiary nodes go as well as the dxchannel ones
[spider.git]
/
cmd
/
announce.pl
diff --git
a/cmd/announce.pl
b/cmd/announce.pl
index f9d3fc4b285b8640c0cf04100ba49600634de184..df7b91d0f54b7913ff423ae64a5981c6e9cf661d 100644
(file)
--- a/
cmd/announce.pl
+++ b/
cmd/announce.pl
@@
-12,15
+12,21
@@
#
# $Id$
#
#
# $Id$
#
+# Modified 13Dec98 Iain Phillips G0RDI
+#
my ($self, $line) = @_;
my @f = split /\s+/, $line;
my ($self, $line) = @_;
my @f = split /\s+/, $line;
+return (1, $self->msg('e5')) if $self->remotecmd;
+return (1, $self->msg('e9')) if !@f;
+
my $sort = uc $f[0];
my @locals = DXCommandmode->get_all();
my $to;
my $from = $self->call;
my $t = ztime(time);
my $tonode;
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;
if ($sort eq "FULL") {
my $sysopflag;
if ($sort eq "FULL") {
@@
-31,14
+37,25
@@
if ($sort eq "FULL") {
@locals = map { $_->priv >= 5 ? $_ : () } @locals;
$to = "SYSOP";
$sysopflag = '*';
@locals = map { $_->priv >= 5 ? $_ : () } @locals;
$to = "SYSOP";
$sysopflag = '*';
+} elsif ($sort eq "LOCAL") {
+ $line =~ s/^$f[0]\s+//; # remove it
+ $to = "LOCAL";
} else {
$to = "LOCAL";
}
} else {
$to = "LOCAL";
}
+# change ^ into : for transmission
+$line =~ s/\^/:/og;
+
+my @bad;
+if (@bad = BadWords::check($line)) {
+ return (1, $self->msg('e17', @bad));
+}
+
+return (1, $self->msg('dup')) if AnnTalk::dup($from, $toflag, $line);
Log('ann', $to, $from, $line);
Log('ann', $to, $from, $line);
-DXProt::broadcast_list("To $to de $from <$t>: $line", @locals);
+DXProt::broadcast_list("To $to de $from <$t>: $line",
'ann', undef,
@locals);
if ($to ne "LOCAL") {
if ($to ne "LOCAL") {
- $line =~ s/\^//og; # remove ^ characters!
my $pc = DXProt::pc12($from, $line, $tonode, $sysopflag, 0);
DXProt::broadcast_ak1a($pc);
}
my $pc = DXProt::pc12($from, $line, $tonode, $sysopflag, 0);
DXProt::broadcast_ak1a($pc);
}