X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=cmd%2Fdx.pl;h=a5d3b4253f8882659dc8eeea48eac8842a837694;hb=067835d5b0160e10a778252cf0dc6b2e4d1a74cb;hp=792f4b7e5f131019580a2c18d413d8f03557b6fd;hpb=e2978821d42b1fc4afb1106dcdbcc5af13edb635;p=spider.git diff --git a/cmd/dx.pl b/cmd/dx.pl index 792f4b7e..a5d3b425 100644 --- a/cmd/dx.pl +++ b/cmd/dx.pl @@ -18,7 +18,7 @@ my $valid = 0; my $localonly; my $oline = $line; -$DB::single=1; +#$DB::single=1; return (1, $self->msg('e5')) if $self->remotecmd || $self->inscript; return (1, $self->msg('e28')) unless $self->isregistered; @@ -45,7 +45,7 @@ if ($f[0] =~ /^by$/i) { return (1, $self->msg('e5')) unless $main::allowdxby || $self->priv > 1; $spotter = uc $f[1]; $line =~ s/^\s*$f[0]\s+$f[1]\s+//; - @f = split /\s+/, $line, 3; + @f = split /\s+/, $line, 3; return (1, $self->msg('dx2')) unless @f >= 2; } @@ -75,7 +75,7 @@ if (is_freq($f[1]) && $f[0] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}) { } $line =~ s/^\s*$f[0]//; $line =~ s/^\s*$f[1]//; -$line =~ s/^\s*//; +$line =~ unpad($line); $line =~ s/\t+/ /g; # do this here because it needs to be stopped ASAP! $line ||= ' '; @@ -172,7 +172,7 @@ if ($freq =~ /^69/ || $localonly) { } else { # send orf to the users $ipaddr ||= $main::mycall; # emergency backstop - my $spot = DXProt::pc61($spotter, $freq, $spotted, $line, $ipaddr); + my $spot = DXProt::pc61($spotter, $freq, $spotted, unpad($line), $ipaddr); $self->dx_spot(undef, undef, @spot); if ($self->isslugged) {