use FindBin;
-use lib $FindBin::Bin;
+use lib "$FindBin::Bin/../lib";
+use lib "$FindBin::Bin/../../lib";
use MAPSFile;
-use MAPSDB;
+use MAPS;
use MAPSLog;
-sub DeliverMail ($$) {
+sub DeliverMail($$) {
my ($userid, $msgfileName) = @_;
# Open maildrop file
# Write msgfile -> $maildrop
print $maildrop "\n\n";
- print $maildrop $_
- while (<$msgfile>);
+ print $maildrop $_ while (<$msgfile>);
# Unlock the file
Unlock $maildrop;
die 'User id not specified' unless $userid;
die 'Msgfile not specified' unless $msgfile;
-my $err = DeliverMail $userid, $msgfile;
+my $errmsg = DeliverMail($userid, $msgfile);
-if ($err) {
- OpenDB 'maps', 'spam';
+if ($errmsg) {
+ #OpenDB('maps', 'spam');
- MAPSDB::SetContext $userid;
+ SetContext($userid);
- Error $err;
+ Error(
+ userid => $userid,
+ message => $errmsg,
+ );
+
+ exit 1;
} # if
-exit $err ? 1 : 0;
+exit 0;