include "site-functions.php";\r
include "MAPS.php";\r
\r
-$logout = $_REQUEST[logout];\r
-$errormsg = $_REQUEST[errormsg];\r
+$logout = $_REQUEST['logout'];\r
+$errormsg = $_REQUEST['errormsg'];\r
\r
if (isset ($logout)) {\r
setcookie ("MAPSUser", "", time()+60*60*24*30, "/maps");\r
close $message;
# Now call MAPSDeliver
- my $status = system "$FindBin::Bin/MAPSDeliver $userid /tmp/MAPSMessage.$$";
+ my ($status, @output) = Execute "$FindBin::Bin/MAPSDeliver $userid /tmp/MAPSMessage.$$";
+ #my $status = system "$FindBin::Bin/MAPSDeliver $userid /tmp/MAPSMessage.$$";
+
+ if ($status != 0) {
+ my $msg = "Unable to deliver message (message left at /tmp/MAPSMessage.%%\n\n";
+ $msg .= join "\n", @output;
+
+ Logmsg(
+ userid => $userid,
+ type => 'whitelist',
+ sender => $sender,
+ message => $msg,
+ );
+
+ Error ($msg, 1);
+ } # if
unlink "/tmp/MAPSMessage.$$";