X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fdx.pl;h=02fc3ca448604706d3ecd06996027faf155bfe24;hb=f9254447dd136868dcc8582f438ebf8984641de2;hp=ce0c304fe87705be7194f66d46a2f1ee1e95f112;hpb=d53c6bd649c5e36ca2b7a780ebbce657f90667fd;p=spider.git

diff --git a/cmd/dx.pl b/cmd/dx.pl
index ce0c304f..02fc3ca4 100644
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -16,7 +16,7 @@ my $freq;
 my @out;
 my $valid = 0;
 my $localonly;
-return (1, $self->msg('e5')) if $self->remotecmd;
+return (1, $self->msg('e5')) if $self->remotecmd || $self->inscript;
 return (1, $self->msg('e28')) unless $self->registered;
 
 my @bad;
@@ -34,11 +34,11 @@ return (1, $self->msg('dx2')) unless @f >= 2;
 # can be in any order
 
 if ($f[0] =~ /^by$/i) {
-	return (1, $self->msg('e5')) unless $self->priv;
+	return (1, $self->msg('e5')) unless $main::allowdxby || $self->priv;
     $spotter = uc $f[1];
-    $line =~ s/^\s*\Q$f[0]\s+\Q$f[1]\s+//;
-	$line = $f[2];
-	@f = split /\s+/, $line;
+    $line =~ s/\s*$f[0]\s+$f[1]\s+//;
+#	$line = $f[2];
+	@f = split /\s+/, $line, 3;
 	return (1, $self->msg('dx2')) unless @f >= 2;
 }