$self->send_motd;
# sort out privilege reduction
- $self->{priv} = 0 unless $self->{hostname} eq '127.0.0.1' || $self->{hostname} eq '::1' || $self->conn->{usedpasswd};
+ $self->{priv} = 0 unless $self->{hostname} eq '127.0.0.1' || $self->conn->peerhost eq '127.0.0.1' || $self->{hostname} eq '::1' || $self->conn->{usedpasswd};
# get the filters
my $nossid = $call;
my $self = shift;
my $cmdline = shift;
my @ans;
+ my @bad;
# save this for them's that need it
my $rawline = $cmdline;
} elsif ($cmdline =~ m|^/+\w+|) {
$cmdline =~ s|^/||;
my $sendit = $cmdline =~ s|^/+||;
- my @in = $self->run_cmd($cmdline);
- $self->send_ans(@in);
- if ($sendit && $self->{talklist} && @{$self->{talklist}}) {
- foreach my $l (@in) {
- my @bad;
- if (@bad = BadWords::check($l)) {
- $self->badcount(($self->badcount||0) + @bad);
- LogDbg('DXCommand', "$self->{call} swore: $l with words:" . join(',', @bad) . ")");
- } else {
+ if (@bad = BadWords::check($cmdline)) {
+ $self->badcount(($self->badcount||0) + @bad);
+ LogDbg('DXCommand', "$self->{call} swore: '$cmdline' with badwords: '" . join(',', @bad) . "'");
+ } else {
+ my @in = $self->run_cmd($cmdline);
+ $self->send_ans(@in);
+ if ($sendit && $self->{talklist} && @{$self->{talklist}}) {
+ foreach my $l (@in) {
for (@{$self->{talklist}}) {
if ($self->{state} eq 'talk') {
$self->send_talks($_, $l);
$self->send($self->{state} eq 'talk' ? $self->talk_prompt : $self->chat_prompt);
} elsif ($self->{talklist} && @{$self->{talklist}}) {
# send what has been said to whoever is in this person's talk list
- my @bad;
if (@bad = BadWords::check($cmdline)) {
$self->badcount(($self->badcount||0) + @bad);
- LogDbg('DXCommand', "$self->{call} swore: $cmdline with words:" . join(',', @bad) . ")");
+ LogDbg('DXCommand', "$self->{call} swore: '$cmdline' with badwords: '" . join(',', @bad) . "'");
} else {
for (@{$self->{talklist}}) {
if ($self->{state} eq 'talk') {
}
$self->send_ans(@ans);
} else {
- $self->send_ans(run_cmd($self, $cmdline));
+# if (@bad = BadWords::check($cmdline)) {
+# $self->badcount(($self->badcount||0) + @bad);
+# LogDbg('DXCommand', "$self->{call} swore: '$cmdline' with badwords: '" . join(',', @bad) . "'");
+# } else {
+ $self->send_ans(run_cmd($self, $cmdline));
+# }
}
# check for excessive swearing
- if ($self->{badcount} && $self->{badcount} >= $maxbadcount) {
+ if ($maxbadcount && $self->{badcount} && $self->{badcount} >= $maxbadcount) {
LogDbg('DXCommand', "$self->{call} logged out for excessive swearing");
$self->disconnect;
return;