X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FHelper%2FCreatePDF.pm;h=d85ad7d8afaca10b60932de4a0e50e4f6b279135;hb=c9d5cc7f38af8db81fcfd11fac6cda62935d41c3;hp=8d36eb74920a1871460e139379e8082bb7618b4b;hpb=a02d6065bf595a427e41d509b2d1d6bbd9138c7b;p=kivitendo-erp.git

diff --git a/SL/Helper/CreatePDF.pm b/SL/Helper/CreatePDF.pm
index 8d36eb749..d85ad7d8a 100644
--- a/SL/Helper/CreatePDF.pm
+++ b/SL/Helper/CreatePDF.pm
@@ -6,6 +6,7 @@ use Carp;
 use Cwd;
 use English qw(-no_match_vars);
 use File::Slurp ();
+use File::Spec ();
 use File::Temp ();
 use List::MoreUtils qw(uniq);
 use List::Util qw(first);
@@ -28,31 +29,44 @@ our %EXPORT_TAGS = (
 sub create_pdf {
   my ($class, %params) = @_;
 
+  return __PACKAGE__->create_parsed_file(
+    format        => 'pdf',
+    template_type => 'LaTeX',
+    %params,
+  );
+}
+
+sub create_parsed_file {
+  my ($class, %params) = @_;
+
   my $userspath       = $::lx_office_conf{paths}->{userspath};
+  my $vars            = $params{variables} || {};
   my $form            = Form->new('');
-  $form->{format}     = 'pdf';
+  $form->{$_}         = $vars->{$_} for keys %{ $vars };
+  $form->{format}     = lc($params{format} || 'pdf');
   $form->{cwd}        = getcwd();
   $form->{templates}  = $::instance_conf->get_templates;
   $form->{IN}         = $params{template};
   $form->{tmpdir}     = $form->{cwd} . '/' . $userspath;
+  my $tmpdir          = $form->{tmpdir};
   my ($suffix)        = $params{template} =~ m{\.(.+)};
 
-  my $vars            = $params{variables} || {};
-  $form->{$_}         = $vars->{$_} for keys %{ $vars };
-
-  my $temp_fh;
-  ($temp_fh, $form->{tmpfile}) = File::Temp::tempfile(
+  my ($temp_fh, $tmpfile) = File::Temp::tempfile(
     'kivitendo-printXXXXXX',
     SUFFIX => ".${suffix}",
-    DIR    => $userspath,
+    DIR    => $form->{tmpdir},
     UNLINK => ($::lx_office_conf{debug} && $::lx_office_conf{debug}->{keep_temp_files})? 0 : 1,
   );
 
-  my $parser = SL::Template::LaTeX->new(
-    $form->{IN},
-    $form,
-    \%::myconfig,
-    $userspath,
+  $form->{tmpfile} = $tmpfile;
+
+  my $parser  = SL::Template::create(
+    type      => ($params{template_type} || 'LaTeX'),
+    source    => $form->{IN},
+    form      => $form,
+    myconfig  => \%::myconfig,
+    userspath => $tmpdir,
+    variable_content_types => $params{variable_content_types},
   );
 
   my $result = $parser->parse($temp_fh);
@@ -65,20 +79,26 @@ sub create_pdf {
     die $parser->get_error;
   }
 
+  # SL::Template:** modify $form->{tmpfile} by removing its
+  # $form->{userspath} prefix. They also store the final file's actual
+  # file name in $form->{tmpfile} – but it is now relative to
+  # $form->{userspath}. Other modules return the full file name…
+  my ($volume, $directory, $file_name) = File::Spec->splitpath($form->{tmpfile});
+  my $full_file_name                   = File::Spec->catfile($tmpdir, $file_name);
   if (($params{return} || 'content') eq 'file_name') {
-    my $new_name = $userspath . '/keep-' . $form->{tmpfile};
-    rename $userspath . '/' . $form->{tmpfile}, $new_name;
+    my $new_name = File::Spec->catfile($tmpdir, 'keep-' . $form->{tmpfile});
+    rename $full_file_name, $new_name;
 
     $form->cleanup;
 
     return $new_name;
   }
 
-  my $pdf = File::Slurp::read_file($userspath . '/' . $form->{tmpfile});
+  my $content = File::Slurp::read_file($full_file_name);
 
   $form->cleanup;
 
-  return $pdf;
+  return $content;
 }
 
 sub merge_pdfs {
@@ -189,7 +209,14 @@ SL::Helper::CreatePDF - A helper for creating PDFs from template files
 =item C<create_pdf %params>
 
 Parses a LaTeX template file, creates a PDF for it and returns either
-its content or its file name. The recognized parameters are:
+its content or its file name. The recognized parameters are the same
+as the ones for L</create_parsed_file> with C<format> and
+C<template_type> being pre-set.
+
+=item C<create_parsed_file %params>
+
+Parses a template file and returns either its content or its file
+name. The recognized parameters are:
 
 =over 2
 
@@ -207,6 +234,14 @@ caller is responsible for deleting it. Otherwise a scalar containing
 the PDF itself is returned and all temporary files have already been
 deleted by L</create_pdf>.
 
+=item * C<format> – optional, defaults to C<pdf> and determines the
+output format. Can be set to C<html> for HTML output if
+C<template_type> is set to C<HTML> as well.
+
+=item * C<template_type> – optional, defaults to C<LaTeX> and
+determines the template's format. Can be set to C<HTML> for HTML
+output if C<format> is set to C<html> as well.
+
 =back
 
 =item C<find_template %params>