projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix syntax errors
[spider.git]
/
cmd
/
announce.pl
diff --git
a/cmd/announce.pl
b/cmd/announce.pl
index a7edb6c076cab7d84bcdd5cd78fb39138bd4258c..5e0ff58c998c4c1c440d3a6a66ac66d0698ae4e8 100644
(file)
--- a/
cmd/announce.pl
+++ b/
cmd/announce.pl
@@
-17,8
+17,9
@@
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('e5')) if $self->remotecmd
|| $self->inscript
;
return (1, $self->msg('e9')) if !@f;
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();
my $sort = uc $f[0];
my @locals = DXCommandmode->get_all();
@@
-31,17
+32,17
@@
my $sysopflag;
if ($sort eq "FULL") {
$line =~ s/^$f[0]\s+//; # remove it
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
}
# change ^ into : for transmission
@@
-49,15
+50,19
@@
$line =~ s/\^/:/og;
my @bad;
if (@bad = BadWords::check($line)) {
my @bad;
if (@bad = BadWords::check($line)) {
- return (1, $self->msg('e17', @bad));
+ $self->badcount(($self->badcount||0) + @bad);
+ Log('DXCommand', "$self->{call} swore: $line");
+ Log('ann', $to, $from, "[to $from only] $line");
+ $self->send("To $to de $from <$t>: $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);
Log('ann', $to, $from, $line);
-DX
Prot::broadcast_list("To $to de $from <$t>: $line
", 'ann', undef, @locals);
-if ($to ne "L
ocal
") {
+DX
Channel::broadcast_list("To $to de $from ($t): $line\a
", 'ann', undef, @locals);
+if ($to ne "L
OCAL
") {
my $pc = DXProt::pc12($from, $line, $tonode, $sysopflag, 0);
my $pc = DXProt::pc12($from, $line, $tonode, $sysopflag, 0);
- DX
Prot::broadcast_ak1a
($pc);
+ DX
Channel::broadcast_nodes
($pc);
}
return (1, ());
}
return (1, ());