1106 |
1106 |
close $temp_fh;
|
1107 |
1107 |
|
1108 |
1108 |
if ($template->uses_temp_file() || $self->{media} eq 'email') {
|
1109 |
|
$out = $self->{OUT};
|
1110 |
|
$out_mode = $self->{OUT_MODE} || '>';
|
1111 |
|
$self->{OUT} = "$self->{tmpfile}";
|
|
1109 |
$out = $self->{OUT};
|
|
1110 |
$out_mode = $self->{OUT_MODE} || '>';
|
|
1111 |
$self->{OUT} = "$self->{tmpfile}";
|
1112 |
1112 |
$self->{OUT_MODE} = '>';
|
1113 |
1113 |
}
|
1114 |
1114 |
|
... | ... | |
1154 |
1154 |
|
1155 |
1155 |
# if we send html or plain text inline
|
1156 |
1156 |
if (($self->{format} eq 'html') && ($self->{sendmode} eq 'inline')) {
|
1157 |
|
$mail->{contenttype} = "text/html";
|
1158 |
|
|
1159 |
|
$mail->{message} =~ s/\r//g;
|
1160 |
|
$mail->{message} =~ s/\n/<br>\n/g;
|
1161 |
|
$myconfig->{signature} =~ s/\n/<br>\n/g;
|
1162 |
|
$mail->{message} .= "<br>\n-- <br>\n$myconfig->{signature}\n<br>";
|
|
1157 |
$mail->{contenttype} = "text/html";
|
|
1158 |
$mail->{message} =~ s/\r//g;
|
|
1159 |
$mail->{message} =~ s/\n/<br>\n/g;
|
|
1160 |
$myconfig->{signature} =~ s/\n/<br>\n/g;
|
|
1161 |
$mail->{message} .= "<br>\n-- <br>\n$myconfig->{signature}\n<br>";
|
1163 |
1162 |
|
1164 |
1163 |
open(IN, "<", $self->{tmpfile})
|
1165 |
1164 |
or $self->error($self->cleanup . "$self->{tmpfile} : $!");
|
1166 |
|
while (<IN>) {
|
1167 |
|
$mail->{message} .= $_;
|
1168 |
|
}
|
1169 |
|
|
|
1165 |
$mail->{message} .= $_ while <IN>;
|
1170 |
1166 |
close(IN);
|
1171 |
1167 |
|
1172 |
1168 |
} else {
|
... | ... | |
1203 |
1199 |
#print(STDERR "OUT $self->{OUT}\n");
|
1204 |
1200 |
for my $i (1 .. $self->{copies}) {
|
1205 |
1201 |
if ($self->{OUT}) {
|
1206 |
|
open OUT, $self->{OUT_MODE}, $self->{OUT} or $self->error($self->cleanup . "$self->{OUT} : $!");
|
|
1202 |
open OUT, $self->{OUT_MODE}, $self->{OUT} or $self->error($self->cleanup . "$self->{OUT} : $!");
|
1207 |
1203 |
print OUT $_ while <IN>;
|
1208 |
1204 |
close OUT;
|
1209 |
|
seek IN, 0, 0;
|
|
1205 |
seek IN, 0, 0;
|
1210 |
1206 |
|
1211 |
1207 |
} else {
|
1212 |
1208 |
$self->{attachment_filename} = ($self->{attachment_filename})
|
Kosmetik