X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=maps%2Flib%2FMAPS.pm;h=7573ed5e1275a586f57516debea18ad39448ddcc;hb=743b8f0606303f1cef5d9c1ed94741f3bb3ef97d;hp=96276123c0a69031cf71cc8ac9477f464cd4b9e2;hpb=8666b497d1f10703a0eac60dd954b2538efe9609;p=clearscm.git diff --git a/maps/lib/MAPS.pm b/maps/lib/MAPS.pm index 9627612..7573ed5 100644 --- a/maps/lib/MAPS.pm +++ b/maps/lib/MAPS.pm @@ -1473,19 +1473,20 @@ sub Whitelist ($$;$$) { my $userid = GetContext; # Dump message into a file - open my $message, '>', "/tmp/MAPSMessage.$$" - or error("Unable to open message file (/tmp/MAPSMessage.$$): $!\n"), return -1; + my $msgfile = "/tmp/MAPSMessage.$$"; + + open my $message, '>', $msgfile + or error("Unable to open message file ($msgfile): $!\n"), return -1; print $message $data; close $message; # Now call MAPSDeliver - my ($status, @output) = Execute "$FindBin::Bin/MAPSDeliver $userid /tmp/MAPSMessage.$$"; - #my $status = system "$FindBin::Bin/MAPSDeliver $userid /tmp/MAPSMessage.$$"; + my ($status, @output) = Execute "$FindBin::Bin/MAPSDeliver $userid $msgfile"; if ($status != 0) { - my $msg = "Unable to deliver message (message left at /tmp/MAPSMessage.%%\n\n"; + my $msg = "Unable to deliver message (message left at $msgfile\n\n"; $msg .= join "\n", @output; Logmsg( @@ -1498,7 +1499,7 @@ sub Whitelist ($$;$$) { Error ($msg, 1); } # if - unlink "/tmp/MAPSMessage.$$"; + unlink $msgfile; if ($status == 0) { Logmsg(