X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=32830c28528dd0923bc2b71b0f72e19b693c630c;hb=dcb4f4b5aa1d99180127681af8996fff1160922c;hp=f28997860f1399a16e782abfcf5970303f159280;hpb=d7dbb7fe3680afb068ffc585b1f95690008a9a7d;p=spider.git diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm index f2899786..32830c28 100644 --- a/perl/DXCommandmode.pm +++ b/perl/DXCommandmode.pm @@ -4,7 +4,7 @@ # # Copyright (c) 1998 Dirk Koopman G1TLH # -# $Id$ +# # package DXCommandmode; @@ -827,7 +827,7 @@ sub local_send # send a talk message here sub talk { - my ($self, $from, $to, $via, $line) = @_; + my ($self, $from, $to, $via, $line, $onode) = @_; $line =~ s/\\5E/\^/g; if ($self->{talk}) { if ($self->{gtk}) { @@ -836,7 +836,7 @@ sub talk $self->local_send('T', "$to de $from: $line"); } } - Log('talk', $to, $from, $via?$via:$main::mycall, $line); + Log('talk', $to, $from, '<' . ($onode || '*'), $line); # send a 'not here' message if required unless ($self->{here} && $from ne $to) { my $key = "$to$from"; @@ -920,9 +920,9 @@ sub format_dx_spot my $t = ztime($_[2]); my $loc = ''; my $clth = $self->{consort} eq 'local' ? 29 : 30; - my $comment = substr $_[3], 0, $clth; + my $comment = substr (($_[3] || ''), 0, $clth); $comment .= ' ' x ($clth - length($comment)); - if ($self->{user}->wantgrid) { + if ($self->{user}->wantgrid) { my $ref = DXUser->get_current($_[4]); if ($ref) { $loc = $ref->qra || '';