From: minima Date: Mon, 11 Jun 2007 15:22:50 +0000 (+0000) Subject: fix free talking in command mode X-Git-Tag: 1.54 X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=4084ebe913391a07070a52266660260f78c26d36;p=spider.git fix free talking in command mode --- diff --git a/cmd/talk.pl b/cmd/talk.pl index a4c9e319..4673392a 100644 --- a/cmd/talk.pl +++ b/cmd/talk.pl @@ -36,8 +36,10 @@ 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; +$DB::single = 1; + # default the 'via' -$via ||= '*'; +#$via ||= '*'; # if there is a line send it, otherwise add this call to the talk list # and set talk mode for command mode @@ -51,7 +53,7 @@ if ($line) { } } else { my $s = $to; - $s .= ">$via" if $via; + $s .= ">$via" if $via && $via ne '*'; my $ref = $self->talklist; if ($ref) { unless (grep { $_ eq $s } @$ref) { diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm index 18f37e88..71efaef7 100644 --- a/perl/DXCommandmode.pm +++ b/perl/DXCommandmode.pm @@ -384,11 +384,11 @@ sub send_talks my ($to, $via) = $ent =~ /(\S+)>(\S+)/; $to = $ent unless $to; - my $call = $via ? $via : $to; + my $call = $via && $via ne '*' ? $via : $to; my $clref = Route::get($call); my $dxchan = $clref->dxchan if $clref; if ($dxchan) { - $dxchan->talk($self->{call}, $to, $via, $line); + $dxchan->talk($self->{call}, $to, undef, $line); } else { $self->send($self->msg('disc2', $via ? $via : $to)); my @l = grep { $_ ne $ent } @{$self->{talklist}}; diff --git a/perl/Spot.pm b/perl/Spot.pm index 4f9f18ab..0df68917 100644 --- a/perl/Spot.pm +++ b/perl/Spot.pm @@ -22,10 +22,8 @@ use QSL; use strict; use vars qw($VERSION $BRANCH); -$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ ); -$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0)); -$main::build += $VERSION; -$main::branch += $BRANCH; + +($VERSION, $BRANCH) = dxver(q$Revision$); use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef $totalspots $hfspots $vhfspots $maxcalllth);