CreatePDF-Helfer von Controller- in allgemeinen Helfer umgewandelt

diff --git a/SL/Controller/Helper/CreatePDF.pm b/SL/Controller/Helper/CreatePDF.pm
deleted file mode 100644 (file)
index 90b5a63..0000000
--- a/SL/Controller/Helper/CreatePDF.pm
+++ /dev/null
@@ -1,98 +0,0 @@
-package SL::Controller::Helper::CreatePDF;
-
-use strict;
-
-use Cwd;
-use English qw(-no_match_vars);
-use File::Slurp ();
-use File::Temp ();
-use String::ShellQuote ();
-
-use SL::Form;
-use SL::Common;
-use SL::MoreCommon;
-use SL::Template;
-use SL::Template::LaTeX;
-
-use Exporter 'import';
-our @EXPORT = qw(create_pdf merge_pdfs);
-
-sub create_pdf {
-  my ($self, %params) = @_;
-
-  my $userspath       = $::lx_office_conf{paths}->{userspath};
-  my $form            = Form->new('');
-  $form->{format}     = 'pdf';
-  $form->{cwd}        = getcwd();
-  $form->{templates}  = $::instance_conf->get_templates;
-  $form->{IN}         = $params{template} . '.tex';
-  $form->{tmpdir}     = $form->{cwd} . '/' . $userspath;
-
-  my $vars            = $params{variables} || {};
-  $form->{$_}         = $vars->{$_} for keys %{ $vars };
-
-  my $temp_fh;
-  ($temp_fh, $form->{tmpfile}) = File::Temp::tempfile(
-    'kivitendo-printXXXXXX',
-    SUFFIX => '.tex',
-    DIR    => $userspath,
-    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,
-  );
-
-  my $result = $parser->parse($temp_fh);
-
-  close $temp_fh;
-  chdir $form->{cwd};
-
-  if (!$result) {
-    $form->cleanup;
-    die $parser->get_error;
-  }
-
-  if (($params{return} || 'content') eq 'file_name') {
-    my $new_name = $userspath . '/keep-' . $form->{tmpfile};
-    rename $userspath . '/' . $form->{tmpfile}, $new_name;
-
-    $form->cleanup;
-
-    return $new_name;
-  }
-
-  my $pdf = File::Slurp::read_file($userspath . '/' . $form->{tmpfile});
-
-  $form->cleanup;
-
-  return $pdf;
-}
-
-sub merge_pdfs {
-  my ($self, %params) = @_;
-
-  return scalar(File::Slurp::read_file($params{file_names}->[0])) if scalar(@{ $params{file_names} }) < 2;
-
-  my ($temp_fh, $temp_name) = File::Temp::tempfile(
-    'kivitendo-printXXXXXX',
-    SUFFIX => '.pdf',
-    DIR    => $::lx_office_conf{paths}->{userspath},
-    UNLINK => ($::lx_office_conf{debug} && $::lx_office_conf{debug}->{keep_temp_files})? 0 : 1,
-  );
-  close $temp_fh;
-
-  my $input_names = join ' ', String::ShellQuote::shell_quote(@{ $params{file_names} });
-  my $exe         = $::lx_office_conf{applications}->{ghostscript} || 'gs';
-  my $output      = `$exe -dBATCH -dNOPAUSE -q -sDEVICE=pdfwrite -sOutputFile=${temp_name} ${input_names} 2>&1`;
-
-  die "Executing gs failed: $ERRNO" if !defined $output;
-  die $output                       if $? != 0;
-
-  return scalar File::Slurp::read_file($temp_name);
-}
-
-1;

diff --git a/SL/Helper/CreatePDF.pm b/SL/Helper/CreatePDF.pm
new file mode 100644 (file)
index 0000000..92349d4
--- /dev/null
+++ b/SL/Helper/CreatePDF.pm
@@ -0,0 +1,101 @@
+package SL::Helper::CreatePDF;
+
+use strict;
+
+use Cwd;
+use English qw(-no_match_vars);
+use File::Slurp ();
+use File::Temp ();
+use String::ShellQuote ();
+
+use SL::Form;
+use SL::Common;
+use SL::MoreCommon;
+use SL::Template;
+use SL::Template::LaTeX;
+
+use Exporter 'import';
+our @EXPORT_OK = qw(create_pdf merge_pdfs);
+our %EXPORT_TAGS = (
+  all => \@EXPORT_OK,
+);
+
+sub create_pdf {
+  my ($class, %params) = @_;
+
+  my $userspath       = $::lx_office_conf{paths}->{userspath};
+  my $form            = Form->new('');
+  $form->{format}     = 'pdf';
+  $form->{cwd}        = getcwd();
+  $form->{templates}  = $::instance_conf->get_templates;
+  $form->{IN}         = $params{template} . '.tex';
+  $form->{tmpdir}     = $form->{cwd} . '/' . $userspath;
+
+  my $vars            = $params{variables} || {};
+  $form->{$_}         = $vars->{$_} for keys %{ $vars };
+
+  my $temp_fh;
+  ($temp_fh, $form->{tmpfile}) = File::Temp::tempfile(
+    'kivitendo-printXXXXXX',
+    SUFFIX => '.tex',
+    DIR    => $userspath,
+    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,
+  );
+
+  my $result = $parser->parse($temp_fh);
+
+  close $temp_fh;
+  chdir $form->{cwd};
+
+  if (!$result) {
+    $form->cleanup;
+    die $parser->get_error;
+  }
+
+  if (($params{return} || 'content') eq 'file_name') {
+    my $new_name = $userspath . '/keep-' . $form->{tmpfile};
+    rename $userspath . '/' . $form->{tmpfile}, $new_name;
+
+    $form->cleanup;
+
+    return $new_name;
+  }
+
+  my $pdf = File::Slurp::read_file($userspath . '/' . $form->{tmpfile});
+
+  $form->cleanup;
+
+  return $pdf;
+}
+
+sub merge_pdfs {
+  my ($class, %params) = @_;
+
+  return scalar(File::Slurp::read_file($params{file_names}->[0])) if scalar(@{ $params{file_names} }) < 2;
+
+  my ($temp_fh, $temp_name) = File::Temp::tempfile(
+    'kivitendo-printXXXXXX',
+    SUFFIX => '.pdf',
+    DIR    => $::lx_office_conf{paths}->{userspath},
+    UNLINK => ($::lx_office_conf{debug} && $::lx_office_conf{debug}->{keep_temp_files})? 0 : 1,
+  );
+  close $temp_fh;
+
+  my $input_names = join ' ', String::ShellQuote::shell_quote(@{ $params{file_names} });
+  my $exe         = $::lx_office_conf{applications}->{ghostscript} || 'gs';
+  my $output      = `$exe -dBATCH -dNOPAUSE -q -sDEVICE=pdfwrite -sOutputFile=${temp_name} ${input_names} 2>&1`;
+
+  die "Executing gs failed: $ERRNO" if !defined $output;
+  die $output                       if $? != 0;
+
+  return scalar File::Slurp::read_file($temp_name);
+}
+
+1;