epic-ts

[kivitendo-erp.git] / SL / Template / HTML.pm

diff --git a/SL/Template/HTML.pm b/SL/Template/HTML.pm
index 1fa7252..ecc3410 100644 (file)
--- 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,11 @@ sub convert_to_postscript {
     $psfile .= ".ps";
   }
 
-  system("html2ps -f html2ps-config < $form->{tmpfile} > $psfile");
+  if (system($::lx_office_conf{applications}->{html2ps} . " -f html2ps-config < $form->{tmpfile} > $psfile") == -1) {
+    die "system call to $::lx_office_conf{applications}->{html2ps} failed: $!";
+  }
   if ($?) {
-    $self->{"error"} = $form->cleanup();
-    $self->cleanup();
+    $self->{"error"} = $form->cleanup($::lx_office_conf{applications}->{html2ps});
     return 0;
   }
 
@@ -106,10 +104,11 @@ sub convert_to_pdf {
     $pdffile .= ".pdf";
   }
 
-  system("html2ps -f html2ps-config < $form->{tmpfile} | ps2pdf - $pdffile");
+  if (system($::lx_office_conf{applications}->{html2ps} . " -f html2ps-config < $form->{tmpfile} | ps2pdf - $pdffile") == -1) {
+    die "system call to $::lx_office_conf{applications}->{html2ps} failed: $!";
+  }
   if ($?) {
-    $self->{"error"} = $form->cleanup();
-    $self->cleanup();
+    $self->{"error"} = $form->cleanup($::lx_office_conf{applications}->{html2ps});
     return 0;
   }