X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FTemplate%2FHTML.pm;h=09f24fcebc5bf799ac99e6f60d27d93f6bd7222d;hb=99d05c2cc969eb4913cac08ae4331c4e6a82726a;hp=1fa7252379b3644aa4670168d168e5770ee9f45f;hpb=0fba3edda47fca21bedb14eb88e0f5f8d983bb38;p=kivitendo-erp.git diff --git a/SL/Template/HTML.pm b/SL/Template/HTML.pm index 1fa725237..09f24fceb 100644 --- a/SL/Template/HTML.pm +++ b/SL/Template/HTML.pm @@ -1,9 +1,6 @@ package SL::Template::HTML; -use SL::Template::LaTeX; - -use vars qw(@ISA); -@ISA = qw(SL::Template::LaTeX); +use parent qw(SL::Template::LaTeX); use strict; @@ -73,10 +70,9 @@ sub convert_to_postscript { $psfile .= ".ps"; } - system("html2ps -f html2ps-config < $form->{tmpfile} > $psfile"); + system($::lx_office_conf{applications}->{html2ps} . " -f html2ps-config < $form->{tmpfile} > $psfile"); if ($?) { - $self->{"error"} = $form->cleanup(); - $self->cleanup(); + $self->{"error"} = $form->cleanup($::lx_office_conf{applications}->{html2ps}); return 0; } @@ -106,10 +102,9 @@ sub convert_to_pdf { $pdffile .= ".pdf"; } - system("html2ps -f html2ps-config < $form->{tmpfile} | ps2pdf - $pdffile"); + system($::lx_office_conf{applications}->{html2ps} . " -f html2ps-config < $form->{tmpfile} | ps2pdf - $pdffile"); if ($?) { - $self->{"error"} = $form->cleanup(); - $self->cleanup(); + $self->{"error"} = $form->cleanup($::lx_office_conf{applications}->{html2ps}); return 0; }