X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FCommon.pm;h=733eb74d8c6e1f8ba2ad1dff3b7602920b9e6a04;hb=35d63a9fdee45777535d7ec815bfbc76c5c1bdc9;hp=c0be296ce04b2adf0aad26e3b76e437d612d6da7;hpb=f5b999c9d46a8ba34314621db141e37c48a06e81;p=kivitendo-erp.git

diff --git a/SL/Common.pm b/SL/Common.pm
index c0be296ce..733eb74d8 100644
--- a/SL/Common.pm
+++ b/SL/Common.pm
@@ -12,11 +12,15 @@ use utf8;
 use strict;
 
 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 SL::DBUtils;
 
@@ -604,18 +608,18 @@ 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);
   opendir my $dh, $complete_path or die "Could not open $complete_path: $!";
 
   my ($newest_name, $newest_time);
@@ -627,11 +631,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) {
@@ -639,28 +642,20 @@ 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/\./$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();
 }
-sub get_current_formatted_time {
-  $main::lxdebug->enter_sub();
-
-  my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst)=localtime(time);
-  my $formatted_current_time = sprintf ( "_%04d%02d%02d_%02d%02d%02d",
-                                   $year+1900,$mon+1,$mday,$hour,$min,$sec);
 
-  $main::lxdebug->leave_sub();
-  return $formatted_current_time;
+sub get_current_formatted_time {
+  return POSIX::strftime('_%Y%m%d_%H%M%S', localtime());
 }
 
 1;