diff options
| author | mark <mark> | 2011-05-20 20:19:44 +0000 |
|---|---|---|
| committer | mark <mark> | 2011-05-20 20:19:44 +0000 |
| commit | bb119c4cc86e906f698a205437790bd8f96bb3d0 (patch) | |
| tree | 5d9f3d66aeb07dba0fa522e28c68ebb5095f71db /FS/FS/Misc.pm | |
| parent | 7091372fa4580cc041feb25263ac3c1d67c59e3f (diff) | |
logging of template-generated mail, #12809
Diffstat (limited to 'FS/FS/Misc.pm')
| -rw-r--r-- | FS/FS/Misc.pm | 36 |
1 files changed, 32 insertions, 4 deletions
diff --git a/FS/FS/Misc.pm b/FS/FS/Misc.pm index a55f4a9..d5f02de 100644 --- a/FS/FS/Misc.pm +++ b/FS/FS/Misc.pm @@ -89,6 +89,11 @@ encoding which, if specified, overrides the default "7bit". (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 @@ -171,12 +176,13 @@ sub send_email { } 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, @@ -238,13 +244,30 @@ sub send_email { 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 ... @@ -279,6 +302,10 @@ Will be placed inside an HTML <BODY> tag. 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. @@ -300,6 +327,7 @@ sub generate_email { 'to' => $args{'to'}, 'bcc' => $args{'bcc'}, 'subject' => $args{'subject'}, + 'cust_msg'=> $args{'cust_msg'}, ); #if (ref($args{'to'}) eq 'ARRAY') { |