CsvImport/Parts: makemodels fix inidzieren

[kivitendo-erp.git] / SL / Common.pm

diff --git a/SL/Common.pm b/SL/Common.pm
index 84cb9c2..33d4d41 100644 (file)
--- a/SL/Common.pm
+++ b/SL/Common.pm
@@ -15,10 +15,13 @@ use Carp;
 use English qw(-no_match_vars);
 use Time::HiRes qw(gettimeofday);
 use Data::Dumper;
-use File::Copy;
+use File::Copy ();
 use File::stat;
 use File::Slurp;
+use File::Spec;
+use List::MoreUtils qw(apply);
 use POSIX ();
+use Encode qw(decode);
 
 use SL::DBUtils;
 
@@ -353,7 +356,7 @@ sub webdav_folder {
     my $base_path = $ENV{'SCRIPT_NAME'};
     $base_path =~ s|[^/]+$||;
     if (opendir my $dir, $path) {
-      foreach my $file (sort { lc $a cmp lc $b } readdir $dir) {
+      foreach my $file (sort { lc $a cmp lc $b } map { decode("UTF-8", $_) } readdir $dir) {
         next if (($file eq '.') || ($file eq '..'));
 
         my $fname = $file;
@@ -394,11 +397,13 @@ sub get_vc_details {
          vc.*,
          pt.description AS payment_terms,
          b.description AS business,
-         l.description AS language
+         l.description AS language,
+         dt.description AS delivery_terms
        FROM ${vc} vc
        LEFT JOIN payment_terms pt ON (vc.payment_id = pt.id)
        LEFT JOIN business b ON (vc.business_id = b.id)
        LEFT JOIN language l ON (vc.language_id = l.id)
+       LEFT JOIN delivery_terms dt ON (vc.delivery_term_id = dt.id)
        WHERE vc.id = ?|;
   my $ref = selectfirst_hashref_query($form, $dbh, $query, $vc_id);
 
@@ -606,18 +611,28 @@ sub copy_file_to_webdav_folder {
   foreach my $item (qw(tmpdir tmpfile type)){
     next if $form->{$item};
     $::lxdebug->message(LXDebug::WARN(), 'Missing parameter');
-    $::form->error($::locale->text("Missing parameter for webdav file copy"));
+    $::form->error($::locale->text("Missing parameter for WebDAV file copy"));
   }
 
   my ($webdav_folder, $document_name) =  get_webdav_folder($form);
 
   if (! $webdav_folder){
     $::lxdebug->leave_sub();
-    $::form->error($::locale->text("Cannot check correct webdav folder"));
+    $::form->error($::locale->text("Cannot check correct WebDAV folder"));
     return undef;
   }
 
-  $complete_path =  join('/', $form->{cwd},  $webdav_folder);
+  $complete_path =  File::Spec->catfile($form->{cwd},  $webdav_folder);
+
+  # maybe the path does not exist (automatic printing), see #2446
+  if (!-d $complete_path) {
+    # we need a chdir and  restore old dir
+    my $current_dir = POSIX::getcwd();
+    chdir("$form->{cwd}");
+    mkdir_with_parents($webdav_folder);
+    chdir($current_dir);
+  }
+
   opendir my $dh, $complete_path or die "Could not open $complete_path: $!";
 
   my ($newest_name, $newest_time);
@@ -629,11 +644,10 @@ sub copy_file_to_webdav_folder {
 
   closedir $dh;
 
-  $latest_file_name    = $complete_path .'/' . $newest_name;
+  $latest_file_name    = File::Spec->catfile($complete_path, $newest_name);
   my $filesize         = stat($latest_file_name)->size;
 
-  my ($ext)            = $form->{tmpfile} =~ /(\.[^.]+)$/;
-  my $current_file     = join('/', $form->{tmpdir}, $form->{tmpfile});
+  my $current_file     = File::Spec->catfile($form->{tmpdir}, apply { s:.*/:: } $form->{tmpfile});
   my $current_filesize = -f $current_file ? stat($current_file)->size : 0;
 
   if ($current_filesize == $filesize) {
@@ -641,15 +655,13 @@ sub copy_file_to_webdav_folder {
     return;
   }
 
-  my $timestamp  =  get_current_formatted_time();
-  my $myfilename =  $form->generate_attachment_filename();
-  $myfilename    =~ s/\./$timestamp\./;
+  my $timestamp =  get_current_formatted_time();
+  my $new_file  =  File::Spec->catfile($form->{cwd}, $webdav_folder, $form->generate_attachment_filename());
+  $new_file =~ s{(.*)\.}{$1$timestamp\.};
 
-  if (!copy(join('/', $form->{tmpdir}, $form->{tmpfile}), join('/', $form->{cwd}, $webdav_folder, $myfilename))) {
-    my $from = join('/', $form->{tmpdir}, $form->{tmpfile});
-    my $to   = join('/', $form->{cwd},    $webdav_folder);
-    $::lxdebug->message(LXDebug::WARN(), "Copy file from $from to $to failed");
-    $::form->error($::locale->text("Copy file from #1 to #2 failed", $from, $to));
+  if (!File::Copy::copy($current_file, $new_file)) {
+    $::lxdebug->message(LXDebug::WARN(), "Copy file from $current_file to $new_file failed: $ERRNO");
+    $::form->error($::locale->text("Copy file from #1 to #2 failed: #3", $current_file, $new_file, $ERRNO));
   }
 
   $::lxdebug->leave_sub();