$to = uc $to;
-return (1, $self->msg('e5')) if $self->remotecmd || $self->inscript;
return (1, $self->msg('e22', $to)) unless is_callsign($to);
-return (1, $self->msg('e28')) unless $self->registered || $to eq $main::myalias;
+return (1, $self->msg('e28')) unless $self->isregistered || $to eq $main::myalias;
$via = uc $via if $via;
my $call = $via || $to;
# default the 'via'
#$via ||= '*';
+my $ipaddr = DXCommandmode::alias_localhost($self->hostname || '127.0.0.1');
+
# if there is a line send it, otherwise add this call to the talk list
# and set talk mode for command mode
if ($line) {
$self->badcount(($self->badcount||0) + @bad);
LogDbg('DXCommand', "$self->{call} swore: $line (with words:" . join(',', @bad) . ")");
} else {
- $main::me->normal(DXProt::pc93($to, $self->call, $via, $line));
+ $main::me->normal(DXProt::pc93($to, $self->call, $via, $line, undef, $ipaddr));
}
} else {
my $s = $to;
my $ref = $self->talklist;
if ($ref) {
unless (grep { $_ eq $s } @$ref) {
- $main::me->normal(DXProt::pc93($to, $self->call, $via, $self->msg('talkstart')));
+ $main::me->normal(DXProt::pc93($to, $self->call, $via, $self->msg('talkstart'), undef, $ipaddr));
$self->state('talk');
push @$ref, $s;
}
} else {
$self->talklist([ $s ]);
- $main::me->normal(DXProt::pc93($to, $self->call, $via, $self->msg('talkstart')));
+ $main::me->normal(DXProt::pc93($to, $self->call, $via, $self->msg('talkstart'), undef, $ipaddr));
push @out, $self->msg('talkinst');
$self->state('talk');
}
- Log('talk', $to, $from, '>' . ($via || ($dxchan && $dxchan->call) || '*'), $self->msg('talkstart'));
+ Log('talk', $to, $from, '>' . ($via || ($dxchan && $dxchan->call) || '*'), $self->msg('talkstart'), undef, $ipaddr);
push @out, $self->talk_prompt;
}