X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FMisc.pm;h=dbebf33b82ad9f51806046c168992ee4e275275d;hb=cc9bdd96a6a3c70b87ef3ed1a9aa15bb0923d61c;hp=6f6f2e2e5f3401efba60f2c579de90be8b4cf66a;hpb=94db42b47263cf72ce248da59898f82a1364b0fa;p=freeside.git diff --git a/FS/FS/Misc.pm b/FS/FS/Misc.pm index 6f6f2e2e5..dbebf33b8 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 { @@ -274,6 +274,7 @@ sub send_email { }); $cust_msg->insert; # ignore errors } + $error; } @@ -375,7 +376,7 @@ sub generate_email { ' '. encode_entities($return{'subject'}), ' ', ' ', - '
', + ' ', @html_data, ' ', '', @@ -413,6 +414,20 @@ sub process_send_email { ''; } +=item process_send_generated_email OPTION => VALUE ... + +Takes arguments as per send_email() and sends the message. This +will die on any error and can be used in the job queue. + +=cut + +sub process_send_generated_email { + my %args = @_; + my $error = send_email(%args); + die "$error\n" if $error; + ''; +} + =item send_fax OPTION => VALUE ... Options: @@ -698,7 +713,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 +772,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 (