X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FMisc.pm;h=71fe7e712f8df260709625d351e5afb2c1651cf3;hb=821c540a2d41f633b1a4e1cd8bda82b8b2ff60de;hp=efad2dfd6027bc5eae5af55a87b1027ca7892778;hpb=5fc8c5edf574ab024d4646914b6432d458e2ffbd;p=freeside.git diff --git a/FS/FS/Misc.pm b/FS/FS/Misc.pm index efad2dfd6..71fe7e712 100644 --- a/FS/FS/Misc.pm +++ b/FS/FS/Misc.pm @@ -41,12 +41,15 @@ I - (optional) MIME type I - (required) arrayref of body text lines +I - (optional) arrayref of MIME::Entity->build PARAMHASH refs, not MIME::Entity objects. These will be passed as arguments to MIME::Entity->attach(). + =cut use vars qw( $conf ); use Date::Format; use Mail::Header; use Mail::Internet 1.44; +use MIME::Entity; use FS::UID; FS::UID->install_callback( sub { @@ -58,36 +61,127 @@ sub send_email { $ENV{MAILADDRESS} = $options{'from'}; my $to = ref($options{to}) ? join(', ', @{ $options{to} } ) : $options{to}; - my @header = ( - 'From: '. $options{'from'}, - 'To: '. $to, - 'Sender: '. $options{'from'}, - 'Reply-To: '. $options{'from'}, - 'Date: '. time2str("%a, %d %b %Y %X %z", time), - 'Subject: '. $options{'subject'}, - ); - push @header, 'Content-Type: '. $options{'content-type'} - if exists($options{'content-type'}); - my $header = new Mail::Header ( \@header ); - my $message = new Mail::Internet ( - 'Header' => $header, - 'Body' => $options{'body'}, + my @mimeparts = (ref($options{'mimeparts'}) eq 'ARRAY') + ? @{$options{'mimeparts'}} : (); + my $mimetype = (scalar(@mimeparts)) ? 'multipart/mixed' : 'text/plain'; + + my @mimeargs; + if (scalar(@mimeparts)) { + @mimeargs = ( + 'Type' => 'multipart/mixed', + ); + + push @mimeparts, + { + 'Data' => $options{'body'}, + 'Disposition' => 'inline', + 'Type' => (($options{'content-type'} ne '') + ? $options{'content-type'} : 'text/plain'), + }; + } else { + @mimeargs = ( + 'Type' => (($options{'content-type'} ne '') + ? $options{'content-type'} : 'text/plain'), + 'Data' => $options{'body'}, + ); + } + + my $message = MIME::Entity->build( + 'From' => $options{'from'}, + 'To' => $to, + 'Sender' => $options{'from'}, + 'Reply-To' => $options{'from'}, + 'Date' => time2str("%a, %d %b %Y %X %z", time), + 'Subject' => $options{'subject'}, + @mimeargs, ); + foreach my $part (@mimeparts) { + next unless ref($part) eq 'HASH'; #warn? + $message->attach(%$part); + } + my $smtpmachine = $conf->config('smtpmachine'); $!=0; - my $rv = $message->smtpsend( 'Host' => $smtpmachine ) - or $message->smtpsend( Host => $smtpmachine, Debug => 1 ); + $message->mysmtpsend( 'Host' => $smtpmachine, + 'MailFrom' => $options{'from'}, + ); - if ($rv) { #smtpsend returns a list of addresses, not true/false - return ''; - } else { - return "can't send email to $to via server $smtpmachine with SMTP: $!"; - } +} + +package Mail::Internet; + +use Mail::Address; +use Net::SMTP; + +sub Mail::Internet::mysmtpsend { + my $src = shift; + my %opt = @_; + my $host = $opt{Host}; + my $envelope = $opt{MailFrom}; + my $noquit = 0; + my $smtp; + my @hello = defined $opt{Hello} ? (Hello => $opt{Hello}) : (); + + push(@hello, 'Port', $opt{'Port'}) + if exists $opt{'Port'}; + + push(@hello, 'Debug', $opt{'Debug'}) + if exists $opt{'Debug'}; + + if(ref($host) && UNIVERSAL::isa($host,'Net::SMTP')) { + $smtp = $host; + $noquit = 1; + } + else { + #local $SIG{__DIE__}; + #$smtp = eval { Net::SMTP->new($host, @hello) }; + $smtp = new Net::SMTP $host, @hello; + } + + unless ( defined($smtp) ) { + my $err = $!; + $err =~ s/Invalid argument/Unknown host/; + return "can't connect to $host: $err" + } + + my $hdr = $src->head->dup; + + _prephdr($hdr); + + # Who is it to + + my @rcpt = map { ref($_) ? @$_ : $_ } grep { defined } @opt{'To','Cc','Bcc'}; + @rcpt = map { $hdr->get($_) } qw(To Cc Bcc) + unless @rcpt; + my @addr = map($_->address, Mail::Address->parse(@rcpt)); + + return 'No valid destination addresses found!' + unless(@addr); + + $hdr->delete('Bcc'); # Remove blind Cc's + + # Send it + + #warn "Headers: \n" . join('',@{$hdr->header}); + #warn "Body: \n" . join('',@{$src->body}); + + my $ok = $smtp->mail( $envelope ) && + $smtp->to(@addr) && + $smtp->data(join("", @{$hdr->header},"\n",@{$src->body})); + + if ( $ok ) { + $smtp->quit + unless $noquit; + return ''; + } else { + return $smtp->code. ' '. $smtp->message; + } } +package FS::Misc; =head1 BUGS