X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fdx.pl;h=ea76aab58bb3e2e309e003223eb121bd9a41dc1e;hb=625db73c7b7d1e3b8269503df195e932d0dedb4f;hp=4a80df0e2fae37ab9202c2786b352383b6ff0d67;hpb=d0b55caa8a609da9ccc5ea59bb376795a99d04b5;p=spider.git diff --git a/cmd/dx.pl b/cmd/dx.pl index 4a80df0e..ea76aab5 100644 --- a/cmd/dx.pl +++ b/cmd/dx.pl @@ -24,7 +24,7 @@ return (1, $self->msg('e5')) if $self->remotecmd || $self->inscript; return (1, $self->msg('e28')) unless $self->isregistered; -my $addr = $self->hostname || '127.0.0.1' +my $addr = $self->hostname || '127.0.0.1'; Log('cmd', "$self->{call}|$addr|dx|$line"); my @bad; @@ -56,7 +56,7 @@ if ($f[0] eq 'ip') { if (is_ipaddr($f[1])) { $ipaddr = $f[1]; } else { - return (1, $self->msg('dx3', $f[1])); + return (1, $self->msg('dx4', $f[1])); } $line =~ s/^\s*$f[0]\s+$f[1]\s+//; @f = split /\s+/, $line, 3; @@ -73,7 +73,9 @@ if (is_freq($f[1]) && $f[0] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}) { } else { return (1, $self->msg('dx3')); } -$line =~ s/^\s*$f[0]\s+$f[1]\s+//; +$line =~ s/^\s*$f[0]//; +$line =~ s/^\s*$f[1]//; +$line =~ unpad($line); $line =~ s/\t+/ /g; # do this here because it needs to be stopped ASAP! $line ||= ' ';