(optional) type parameter for multipart/related messages
+=item cust_msg
+
+(optional) L<FS::cust_msg> object. If provided, it will be updated
+with the message envelope information, contents, and server response.
+
=back
=cut
}
my $message_id = join('.', rand()*(2**32), $$, time). "\@$domain";
+ my $time = time;
my $message = MIME::Entity->build(
'From' => $options{'from'},
'To' => join(', ', @to),
'Sender' => $options{'from'},
'Reply-To' => $options{'from'},
- 'Date' => time2str("%a, %d %b %Y %X %z", time),
+ 'Date' => time2str("%a, %d %b %Y %X %z", $time),
'Subject' => $options{'subject'},
'Message-ID' => "<$message_id>",
@mimeargs,
eval { sendmail($message, { transport => $transport,
from => $options{from},
to => \@to }) };
-
+
+ my $error = '';
if(ref($@) and $@->isa('Email::Sender::Failure')) {
- return ($@->code ? $@->code.' ' : '').$@->message
+ $error = $@->code.' ' if $@->code;
+ $error .= $@->message;
}
else {
- return $@;
+ $error = $@;
}
+
+ # Logging
+ my $cust_msg = $options{'cust_msg'};
+ if ( $cust_msg ) {
+ $cust_msg->env_from($options{from});
+ $cust_msg->env_to(join(",", @to));
+ $cust_msg->header($message->header_as_string);
+ $cust_msg->body($message->body_as_string);
+ $cust_msg->_date($time);
+ $cust_msg->error($error);
+ $cust_msg->status( $error ? 'failed' : 'sent' );
+ $cust_msg->replace;
+ };
+ return $error;
+
}
=item generate_email OPTION => VALUE ...
Email body (Text alternative). Arrayref of lines, or scalar.
+=item cust_msg (optional)
+
+An L<FS::cust_msg> object. Will be passed through to send_email.
+
=back
Constructs a multipart message from text_body and html_body.
'to' => $args{'to'},
'bcc' => $args{'bcc'},
'subject' => $args{'subject'},
+ 'cust_msg'=> $args{'cust_msg'},
);
#if (ref($args{'to'}) eq 'ARRAY') {
local($SIG{CHLD}) = sub {};
run( \@cmd, '>'=>'/dev/null', '2>'=>'/dev/null', timeout($timeout) )
- or die "pslatex $file.tex failed; see $file.log for details?\n";
+ or warn "bad exit status from pslatex pass $_\n";
}
+ return if -e "$file.dvi" && -s "$file.dvi";
+ die "pslatex $file.tex failed; see $file.log for details?\n";
+
}
=item print ARRAYREF