projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix sh/dx properly both for freq range and adding a . to the end of
[spider.git]
/
cmd
/
announce.pl
diff --git
a/cmd/announce.pl
b/cmd/announce.pl
index 120170399ad6ae17fb1a0f8021b26141e77df62a..a7edb6c076cab7d84bcdd5cd78fb39138bd4258c 100644
(file)
--- a/
cmd/announce.pl
+++ b/
cmd/announce.pl
@@
-17,7
+17,7
@@
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];
return (1, $self->msg('e9')) if !@f;
my $sort = uc $f[0];
@@
-26,30
+26,36
@@
my $to;
my $from = $self->call;
my $t = ztime(time);
my $tonode;
my $from = $self->call;
my $t = ztime(time);
my $tonode;
+my $toflag = '*';
my $sysopflag;
if ($sort eq "FULL") {
$line =~ s/^$f[0]\s+//; # remove it
my $sysopflag;
if ($sort eq "FULL") {
$line =~ s/^$f[0]\s+//; # remove it
- $to = "A
LL
";
+ $to = "A
ll
";
} elsif ($sort eq "SYSOP") {
$line =~ s/^$f[0]\s+//; # remove it
@locals = map { $_->priv >= 5 ? $_ : () } @locals;
} elsif ($sort eq "SYSOP") {
$line =~ s/^$f[0]\s+//; # remove it
@locals = map { $_->priv >= 5 ? $_ : () } @locals;
- $to = "S
YSOP
";
+ $to = "S
ysop
";
$sysopflag = '*';
} elsif ($sort eq "LOCAL") {
$line =~ s/^$f[0]\s+//; # remove it
$sysopflag = '*';
} elsif ($sort eq "LOCAL") {
$line =~ s/^$f[0]\s+//; # remove it
- $to = "L
OCAL
";
+ $to = "L
ocal
";
} else {
} else {
- $to = "L
OCAL
";
+ $to = "L
ocal
";
}
# change ^ into : for transmission
$line =~ s/\^/:/og;
}
# 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);
DXProt::broadcast_list("To $to de $from <$t>: $line", 'ann', undef, @locals);
Log('ann', $to, $from, $line);
DXProt::broadcast_list("To $to de $from <$t>: $line", 'ann', undef, @locals);
-if ($to ne "LOCAL") {
- $line =~ s/\^//og; # remove ^ characters!
+if ($to ne "Local") {
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);
}