projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix ping handling better
[spider.git]
/
perl
/
DXCommandmode.pm
diff --git
a/perl/DXCommandmode.pm
b/perl/DXCommandmode.pm
index 29840c410e4c788359f97cbe26780dce0ce0519d..ecd65716f71da86fac4f27df28b7af0d7f3ae5b6 100644
(file)
--- a/
perl/DXCommandmode.pm
+++ b/
perl/DXCommandmode.pm
@@
-35,6
+35,7
@@
use Net::Telnet;
use QSL;
use DB_File;
use VE7CC;
use QSL;
use DB_File;
use VE7CC;
+use DXXml;
use strict;
use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug
use strict;
use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug
@@
-93,7
+94,7
@@
sub start
my $host = $self->{conn}->{peerhost};
$host ||= "AGW Port #$self->{conn}->{agwport}" if exists $self->{conn}->{agwport};
$host ||= "unknown";
my $host = $self->{conn}->{peerhost};
$host ||= "AGW Port #$self->{conn}->{agwport}" if exists $self->{conn}->{agwport};
$host ||= "unknown";
- Log('DXCommand', "$call connected from $host");
+ Log
Dbg
('DXCommand', "$call connected from $host");
$self->{name} = $name ? $name : $call;
$self->send($self->msg('l2',$self->{name}));
$self->{name} = $name ? $name : $call;
$self->send($self->msg('l2',$self->{name}));
@@
-297,7
+298,7
@@
sub normal
my @bad;
if (@bad = BadWords::check($l)) {
$self->badcount(($self->badcount||0) + @bad);
my @bad;
if (@bad = BadWords::check($l)) {
$self->badcount(($self->badcount||0) + @bad);
- Log
('DXCommand', "$self->{call} swore: $l
");
+ Log
Dbg('DXCommand', "$self->{call} swore: $l with words:" . join(',', @bad) . ")
");
} else {
for (@{$self->{talklist}}) {
$self->send_talks($_, $l);
} else {
for (@{$self->{talklist}}) {
$self->send_talks($_, $l);
@@
-562,7
+563,7
@@
sub disconnect
# send info to all logged in thingies
$self->tell_login('logoutu');
# send info to all logged in thingies
$self->tell_login('logoutu');
- Log('DXCommand', "$call disconnected");
+ Log
Dbg
('DXCommand', "$call disconnected");
$self->SUPER::disconnect;
}
$self->SUPER::disconnect;
}
@@
-1026,8
+1027,7
@@
sub import_cmd
# are there any to do in this directory?
return unless -d $cmdimportdir;
unless (opendir(DIR, $cmdimportdir)) {
# are there any to do in this directory?
return unless -d $cmdimportdir;
unless (opendir(DIR, $cmdimportdir)) {
- dbg("can\'t open $cmdimportdir $!");
- Log('err', "can\'t open $cmdimportdir $!");
+ LogDbg('err', "can\'t open $cmdimportdir $!");
return;
}
return;
}
@@
-1039,9
+1039,7
@@
sub import_cmd
my $s = Script->new($name, $cmdimportdir);
if ($s) {
my $s = Script->new($name, $cmdimportdir);
if ($s) {
-
- dbg("Run import cmd file $name");
- Log('DXCommand', "Run import cmd file $name");
+ LogDbg('DXCommand', "Run import cmd file $name");
my @cat = split /[^A-Za-z0-9]+/, $name;
my ($call) = grep {is_callsign(uc $_)} @cat;
$call ||= $main::mycall;
my @cat = split /[^A-Za-z0-9]+/, $name;
my ($call) = grep {is_callsign(uc $_)} @cat;
$call ||= $main::mycall;
@@
-1072,19
+1070,16
@@
sub import_cmd
$dxchan->{priv} = $priv;
$dxchan->{user} = $user;
} else {
$dxchan->{priv} = $priv;
$dxchan->{user} = $user;
} else {
- Log('err', "Trying to run import cmd for non-existant user $call");
- dbg( "Trying to run import cmd for non-existant user $call");
+ LogDbg('err', "Trying to run import cmd for non-existant user $call");
}
}
}
$s->erase;
for (@out) {
}
}
}
$s->erase;
for (@out) {
- Log('DXCommand', "Import cmd $name/$call: $_");
- dbg("Import cmd $name/$call: $_");
+ LogDbg('DXCommand', "Import cmd $name/$call: $_");
}
} else {
}
} else {
- Log("Failed to open $cmdimportdir/$name $!");
- dbg("Failed to open $cmdimportdir/$name $!");
+ LogDbg('err', "Failed to open $cmdimportdir/$name $!");
unlink "$cmdimportdir/$name";
}
}
unlink "$cmdimportdir/$name";
}
}