my @to;
if ( exists($opt{'to'}) ) {
- @to = split(/\s*,\s*/, $opt{'to'});
+ @to = map { $_->format } Email::Address->parse($opt{'to'});
} elsif ( $cust_main ) {
- if ( $opt{'to_contact_classnum'} ) {
-
- my $classnum = $opt{'to_contact_classnum'};
- my @classes = ref($classnum) ? @$classnum : split(',', $classnum);
- if ( !@classes ) {
- # traditional behavior: send to invoice email destinations (only)
- @classes = ( 'invoice' );
- }
- @to = $cust_main->contact_list_email(@classes);
- # not guaranteed to produce contacts, but then customers aren't
- # guaranteed to have email addresses on file. in that case, env_to
- # will be null and sending this message will fail.
- }
+ my $classnum = $opt{'to_contact_classnum'} || '';
+ my @classes = ref($classnum) ? @$classnum : split(',', $classnum);
+ # traditional behavior: send to all invoice recipients
+ @classes = ('invoice') unless @classes;
+ @to = $cust_main->contact_list_email(@classes);
+ # not guaranteed to produce contacts, but then customers aren't
+ # guaranteed to have email addresses on file. in that case, env_to
+ # will be null and sending this message will fail.
} else {
die 'no To: address or cust_main object specified';
# effective To: address (not in headers)
push @to, $self->bcc_addr if $self->bcc_addr;
- my $env_to = join(', ', @to);
+ my @env_to;
+ foreach my $dest (@to) {
+ push @env_to, map { $_->address } Email::Address->parse($dest);
+ }
my $cust_msg = FS::cust_msg->new({
'custnum' => $cust_main ? $cust_main->custnum : '',
'msgnum' => $self->msgnum,
'_date' => $time,
'env_from' => $env_from,
- 'env_to' => $env_to,
+ 'env_to' => join(',', @env_to),
'header' => $message->header_as_string,
'body' => $message->body_as_string,
'error' => '',
$domain = $1;
}
- my @to = split(/\s*,\s*/, $cust_msg->env_to);
+ # in principle should already be a list of bare addresses, but run it
+ # through Email::Address to make sure
+ my @env_to = map { $_->address } Email::Address->parse($cust_msg->env_to);
my %smtp_opt = ( 'host' => $conf->config('smtpmachine'),
'helo' => $domain );
eval {
sendmail( $message, { transport => $transport,
from => $cust_msg->env_from,
- to => \@to })
+ to => \@env_to })
};
my $error = '';
if(ref($@) and $@->isa('Email::Sender::Failure')) {