package Mailer;
+use Email::Address;
+
use SL::Common;
use SL::Template;
my $l_start = length($q_start);
my $new_text = "$q_start";
- $chars_left -= $l_start;
+ $chars_left -= $l_start if (defined $chars_left);
for (my $i = 0; $i < length($text); $i++) {
my $char = ord(substr($text, $i, 1));
- if (($char < 32) || ($char > 127) ||
- ($char == ord('?')) || ($char == ord('_'))) {
- if ($chars_left < 5) {
+ if (($char < 32) || ($char > 127) || ($char == ord('?')) || ($char == ord('_'))) {
+ if ((defined $chars_left) && ($chars_left < 5)) {
$new_text .= "?=\n $q_start";
$chars_left = 75 - $l_start;
}
$new_text .= sprintf("=%02X", $char);
- $chars_left -= 3;
+ $chars_left -= 3 if (defined $chars_left);
} else {
$char = ord('_') if ($char == ord(' '));
- if ($chars_left < 5) {
+ if ((defined $chars_left) && ($chars_left < 5)) {
$new_text .= "?=\n $q_start";
$chars_left = 75 - $l_start;
}
$new_text .= chr($char);
- $chars_left--;
+ $chars_left-- if (defined $chars_left);
}
}
local (*IN, *OUT);
$num_sent++;
- my $boundary = time() . "-$$-${num_sent}";
- $boundary = "LxOffice-$self->{version}-$boundary";
- my $domain = $self->{from};
- $domain =~ s/(.*?\@|>)//g;
- my $msgid = "$boundary\@$domain";
-
- my $form = $main::form;
- my $myconfig = \%main::myconfig;
-
- my $email = $myconfig->{email};
- $email =~ s/[^\w\.\-\+=@]//ig;
+ my $boundary = time() . "-$$-${num_sent}";
+ $boundary = "LxOffice-$self->{version}-$boundary";
+ my $domain = $self->{from};
+ $domain =~ s/(.*?\@|>)//g;
+ my $msgid = "$boundary\@$domain";
- $form->{myconfig_email} = $email;
+ my $form = $main::form;
+ my $myconfig = \%main::myconfig;
- my $template = PlainTextTemplate->new(undef, $form, $myconfig);
- my $sendmail = $template->parse_block($main::sendmail);
+ my $email = $myconfig->{email};
+ $email =~ s/[^\w\.\-\+=@]//ig;
- $self->{charset} = Common::DEFAULT_CHARSET unless $self->{charset};
+ my %temp_form = ( %{ $form }, 'myconfig_email' => $email );
+ my $template = PlainTextTemplate->new(undef, \%temp_form, $myconfig);
+ my $sendmail = $template->parse_block($main::sendmail);
if (!open(OUT, $sendmail)) {
$main::lxdebug->leave_sub();
return "$sendmail : $!";
}
- $self->{contenttype} = "text/plain" unless $self->{contenttype};
-
- my ($cc, $bcc);
- $cc = "Cc: $self->{cc}\n" if $self->{cc};
- $bcc = "Bcc: $self->{bcc}\n" if $self->{bcc};
+ $self->{charset} ||= Common::DEFAULT_CHARSET;
+ $self->{contenttype} ||= "text/plain";
foreach my $item (qw(to cc bcc)) {
+ next unless ($self->{$item});
$self->{$item} =~ s/\</</g;
$self->{$item} =~ s/\$<\$/</g;
$self->{$item} =~ s/\>/>/g;
$self->{$item} =~ s/\$>\$/>/g;
}
- my $subject = $self->mime_quote_text($self->{subject}, 60);
+ my $headers = '';
+ foreach my $item (qw(from to cc)) {
+ next unless ($self->{$item});
+ my (@addr_objects) = Email::Address->parse($self->{$item});
+ next unless (scalar @addr_objects);
+
+ foreach my $addr_obj (@addr_objects) {
+ my $phrase = $addr_obj->phrase();
+ if ($phrase) {
+ $phrase =~ s/^\"//;
+ $phrase =~ s/\"$//;
+ $addr_obj->phrase($self->mime_quote_text($phrase));
+ }
+
+ $headers .= sprintf("%s: %s\n", ucfirst($item), $addr_obj->format());
+ }
+ }
+
+ $headers .= sprintf("Subject: %s\n", $self->mime_quote_text($self->{subject}, 60));
- print OUT qq|From: $self->{from}
-To: $self->{to}
-${cc}${bcc}Subject: $subject
-Message-ID: <$msgid>
+ print OUT qq|${headers}Message-ID: <$msgid>
X-Mailer: Lx-Office $self->{version}
MIME-Version: 1.0
|;