X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FMisc.pm;h=6b2fd81f8392cd5477e9056296ad4faca1052446;hb=f76241e0d0252e50170706d8bfa9b79cdbae59b4;hp=6f6f2e2e5f3401efba60f2c579de90be8b4cf66a;hpb=f765ad6313abc1dc73bab4d3b617d2754cf85823;p=freeside.git diff --git a/FS/FS/Misc.pm b/FS/FS/Misc.pm index 6f6f2e2e5..6b2fd81f8 100644 --- a/FS/FS/Misc.pm +++ b/FS/FS/Misc.pm @@ -108,7 +108,7 @@ use Date::Format; use MIME::Entity; use Email::Sender::Simple qw(sendmail); use Email::Sender::Transport::SMTP; -use Email::Sender::Transport::SMTP::TLS; +use Email::Sender::Transport::SMTP::TLS 0.11; use FS::UID; FS::UID->install_callback( sub { @@ -375,7 +375,7 @@ sub generate_email { ' '. encode_entities($return{'subject'}), ' ', ' ', - '
', + ' ', @html_data, ' ', '', @@ -698,7 +698,8 @@ sub generate_ps { open(POSTSCRIPT, "<$file.ps") or die "can't open $file.ps: $! (error in LaTeX template?)\n"; - unlink("$file.dvi", "$file.log", "$file.aux", "$file.ps", "$file.tex"); + unlink("$file.dvi", "$file.log", "$file.aux", "$file.ps", "$file.tex") + unless $FS::CurrentUser::CurrentUser->option('save_tmp_typesetting'); my $ps = ''; @@ -756,7 +757,8 @@ sub generate_pdf { open(PDF, "<$file.pdf") or die "can't open $file.pdf: $! (error in LaTeX template?)\n"; - unlink("$file.dvi", "$file.log", "$file.aux", "$file.pdf", "$file.tex"); + unlink("$file.dvi", "$file.log", "$file.aux", "$file.pdf", "$file.tex") + unless $FS::CurrentUser::CurrentUser->option('save_tmp_typesetting'); my $pdf = ''; while (