PDF-Erzeugung: alles in temporärem Unterverzeichnis von users erledigen

[mfinanz.git] / SL / Form.pm

diff --git a/SL/Form.pm b/SL/Form.pm
index 097b65d8dda0db42a54dadbf5cd227bcf861c600..e814351362ce575206c3a4e03854e0bd956d2a6e 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -47,6 +47,7 @@ use CGI;
 use Cwd;
 use Encode;
 use File::Copy;
 use Cwd;
 use Encode;
 use File::Copy;

+use File::Temp ();

 use IO::File;
 use Math::BigInt;
 use POSIX qw(strftime);
 use IO::File;
 use Math::BigInt;
 use POSIX qw(strftime);


@@ -909,11 +910,18 @@ sub parse_template {
 
   local (*IN, *OUT);
 
 
   local (*IN, *OUT);
 

-  my $defaults  = SL::DB::Default->get;
-  my $userspath = $::lx_office_conf{paths}->{userspath};
+  my $defaults        = SL::DB::Default->get;

 
 

-  $self->{"cwd"} = getcwd();
-  $self->{"tmpdir"} = $self->{cwd} . "/${userspath}";
+  my $keep_temp_files = $::lx_office_conf{debug} && $::lx_office_conf{debug}->{keep_temp_files};
+  $self->{cwd}        = getcwd();
+  my $temp_dir        = File::Temp->newdir(
+    "kivitendo-print-XXXXXX",
+    DIR     => $self->{cwd} . "/" . $::lx_office_conf{paths}->{userspath},
+    CLEANUP => !$keep_temp_files,
+  );
+
+  my $userspath   = File::Spec->abs2rel($temp_dir->dirname);
+  $self->{tmpdir} = $temp_dir->dirname;

 
   my $ext_for_format;
 
 
   my $ext_for_format;
 


@@ -973,7 +981,6 @@ sub parse_template {
 
   # OUT is used for the media, screen, printer, email
   # for postscript we store a copy in a temporary file
 
   # OUT is used for the media, screen, printer, email
   # for postscript we store a copy in a temporary file

-  my $keep_temp_files = $::lx_office_conf{debug} && $::lx_office_conf{debug}->{keep_temp_files};

 
   my ($temp_fh, $suffix);
   $suffix =  $self->{IN};
 
   my ($temp_fh, $suffix);
   $suffix =  $self->{IN};