projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix new pc9x midnight rollover bug
[spider.git]
/
cmd
/
talk.pl
diff --git
a/cmd/talk.pl
b/cmd/talk.pl
index 4673392a0ca345fba3d28399b0b75982e2e691eb..acd2eba54f84e6a70a73a826a18924b78532c70e 100644
(file)
--- a/
cmd/talk.pl
+++ b/
cmd/talk.pl
@@
-1,9
+1,9
@@
#
#
-# The talk command
+# The talk command
(improved)
#
# Copyright (c) 1998 Dirk Koopman G1TLH
#
#
# Copyright (c) 1998 Dirk Koopman G1TLH
#
-#
$Id$
+#
#
my ($self, $inline) = @_;
#
my ($self, $inline) = @_;
@@
-28,15
+28,20
@@
if ($via) {
($to, $line) = split /\s+/, $inline, 2;
}
($to, $line) = split /\s+/, $inline, 2;
}
-$to = uc $to if $to;
+return (1, $self->msg('e8')) unless $to;
+
+$to = uc $to;
+
+return (1, $self->msg('e22', $to)) unless is_callsign($to);
+return (1, $self->msg('e28')) unless $self->registered || $to eq $main::myalias;
+
$via = uc $via if $via;
$via = uc $via if $via;
-my $call = $via
? $via :
$to;
+my $call = $via
||
$to;
my $clref = Route::get($call); # try an exact call
my $dxchan = $clref->dxchan if $clref;
my $clref = Route::get($call); # try an exact call
my $dxchan = $clref->dxchan if $clref;
-#return (1, $self->msg('e7', $call)) unless $dxchan;
-return (1, $self->msg('e28')) unless $self->registered || $to eq $main::myalias;
+push @out, $self->msg('e7', $call) unless $dxchan;
-$DB::single = 1;
+
#
$DB::single = 1;
# default the 'via'
#$via ||= '*';
# default the 'via'
#$via ||= '*';
@@
-45,6
+50,7
@@
$DB::single = 1;
# and set talk mode for command mode
if ($line) {
my @bad;
# and set talk mode for command mode
if ($line) {
my @bad;
+ Log('talk', $to, $from, '>' . ($via || ($dxchan && $dxchan->call) || '*'), $line);
if (@bad = BadWords::check($line)) {
$self->badcount(($self->badcount||0) + @bad);
LogDbg('DXCommand', "$self->{call} swore: $line (with words:" . join(',', @bad) . ")");
if (@bad = BadWords::check($line)) {
$self->badcount(($self->badcount||0) + @bad);
LogDbg('DXCommand', "$self->{call} swore: $line (with words:" . join(',', @bad) . ")");
@@
-67,6
+73,7
@@
if ($line) {
push @out, $self->msg('talkinst');
$self->state('talk');
}
push @out, $self->msg('talkinst');
$self->state('talk');
}
+ Log('talk', $to, $from, '>' . ($via || ($dxchan && $dxchan->call) || '*'), $self->msg('talkstart'));
push @out, $self->talk_prompt;
}
push @out, $self->talk_prompt;
}