change the filter reading order to call, call no ssid, user_default.

[spider.git] / cmd / export.pl

diff --git a/cmd/export.pl b/cmd/export.pl
index 723cdcb6ea33ed3ff9ec5d1cdfd3d0f989fef0f2..fc1ebfd5dc3a405166f295a25d4725efb4f52af0 100644 (file)
--- a/cmd/export.pl
+++ b/cmd/export.pl
@@ -14,7 +14,7 @@ my @body;
 my $ref;
 my $fn;
 
-return (1, $self->msg("e5")) if $self->priv < 9 || $self->consort ne 'local' || $self->remotecmd;
+return (1, $self->msg("e5")) if $self->priv < 9 || $self->consort ne 'local' || $self->remotecmd || $self->inscript;
 
 return (1, $self->msg("export1")) unless @f == 2 && $f[0] =~ /^\d+$/;
 $msgno = $f[0];
@@ -25,7 +25,7 @@ return (1, $self->msg('read2', $msgno)) unless $ref;
 if (-e $fn) {
        my $m = $self->msg('e16', $fn);
        Log('msg', $self->call . " tried to export $m");
-       dbg('msg', $m);
+       dbg($m) if isdbg('msg');
        return (1, $m);
 }
 
@@ -47,7 +47,7 @@ if ($fh) {
        $m = $self->msg('export2', $msgno, $fn, $!, $self->call);
 } 
 Log('msg', $m);
-dbg('msg', $m);
+dbg($m) if isdbg('msg');
 push @out, $m;
 
 return (1, @out);