X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FCommon.pm;h=33d4d41cf48705c563500b6defac83667a66ae7f;hb=17384c044b465c262772eb9737ea298069c4d826;hp=e63b698a18b4738018549a82ce6891f15b24d2cb;hpb=dbda14c263efd93aca3b7114015a47d86b8581e3;p=kivitendo-erp.git

diff --git a/SL/Common.pm b/SL/Common.pm
index e63b698a1..33d4d41cf 100644
--- a/SL/Common.pm
+++ b/SL/Common.pm
@@ -12,8 +12,16 @@ 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::stat;
+use File::Slurp;
+use File::Spec;
+use List::MoreUtils qw(apply);
+use POSIX ();
+use Encode qw(decode);
 
 use SL::DBUtils;
 
@@ -332,40 +340,15 @@ sub webdav_folder {
   my ($form) = @_;
 
   return $main::lxdebug->leave_sub()
-    unless ($::lx_office_conf{features}->{webdav} && $form->{id});
+    unless ($::instance_conf->get_webdav && $form->{id});
 
-  croak "No client set in \$::auth" unless $::auth->client;
 
-  my ($path, $number);
 
   $form->{WEBDAV} = [];
 
-  if ($form->{type} eq "sales_quotation") {
-    ($path, $number) = ("angebote", $form->{quonumber});
-  } elsif ($form->{type} eq "sales_order") {
-    ($path, $number) = ("bestellungen", $form->{ordnumber});
-  } elsif ($form->{type} eq "request_quotation") {
-    ($path, $number) = ("anfragen", $form->{quonumber});
-  } elsif ($form->{type} eq "purchase_order") {
-    ($path, $number) = ("lieferantenbestellungen", $form->{ordnumber});
-  } elsif ($form->{type} eq "sales_delivery_order") {
-    ($path, $number) = ("verkaufslieferscheine", $form->{donumber});
-  } elsif ($form->{type} eq "purchase_delivery_order") {
-    ($path, $number) = ("einkaufslieferscheine", $form->{donumber});
-  } elsif ($form->{type} eq "credit_note") {
-    ($path, $number) = ("gutschriften", $form->{invnumber});
-  } elsif ($form->{vc} eq "customer") {
-    ($path, $number) = ("rechnungen", $form->{invnumber});
-  } else {
-    ($path, $number) = ("einkaufsrechnungen", $form->{invnumber});
-  }
-
+  my ($path, $number) = get_webdav_folder($form);
   return $main::lxdebug->leave_sub() unless ($path && $number);
 
-  $number =~ s|[/\\]|_|g;
-
-  $path = "webdav/" . $::auth->client->{id} . "/${path}/${number}";
-
   if (!-d $path) {
     mkdir_with_parents($path);
 
@@ -373,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;
@@ -414,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);
 
@@ -574,6 +559,118 @@ sub check_params_x {
   }
 }
 
+sub get_webdav_folder {
+  $main::lxdebug->enter_sub();
+
+  my ($form) = @_;
+
+  croak "No client set in \$::auth" unless $::auth->client;
+
+  my ($path, $number);
+
+  # dispatch table
+  if ($form->{type} eq "sales_quotation") {
+    ($path, $number) = ("angebote", $form->{quonumber});
+  } elsif ($form->{type} eq "sales_order") {
+    ($path, $number) = ("bestellungen", $form->{ordnumber});
+  } elsif ($form->{type} eq "request_quotation") {
+    ($path, $number) = ("anfragen", $form->{quonumber});
+  } elsif ($form->{type} eq "purchase_order") {
+    ($path, $number) = ("lieferantenbestellungen", $form->{ordnumber});
+  } elsif ($form->{type} eq "sales_delivery_order") {
+    ($path, $number) = ("verkaufslieferscheine", $form->{donumber});
+  } elsif ($form->{type} eq "purchase_delivery_order") {
+    ($path, $number) = ("einkaufslieferscheine", $form->{donumber});
+  } elsif ($form->{type} eq "credit_note") {
+    ($path, $number) = ("gutschriften", $form->{invnumber});
+  } elsif ($form->{vc} eq "customer") {
+    ($path, $number) = ("rechnungen", $form->{invnumber});
+  } elsif ($form->{vc} eq "vendor") {
+    ($path, $number) = ("einkaufsrechnungen", $form->{invnumber});
+  } else {
+    $main::lxdebug->leave_sub();
+    return undef;
+  }
+
+  $number =~ s|[/\\]|_|g;
+
+  $path = "webdav/" . $::auth->client->{id} . "/${path}/${number}";
+
+  $main::lxdebug->leave_sub();
+
+  return ($path, $number);
+}
+
+sub copy_file_to_webdav_folder {
+  $::lxdebug->enter_sub();
+
+  my ($form) = @_;
+  my ($last_mod_time, $latest_file_name, $complete_path);
+
+  # checks
+  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"));
+  }
+
+  my ($webdav_folder, $document_name) =  get_webdav_folder($form);
+
+  if (! $webdav_folder){
+    $::lxdebug->leave_sub();
+    $::form->error($::locale->text("Cannot check correct WebDAV folder"));
+    return undef;
+  }
+
+  $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);
+  while ( defined( my $file = readdir( $dh ) ) ) {
+    my $path = File::Spec->catfile( $complete_path, $file );
+    next if -d $path; # skip directories, or anything else you like
+    ( $newest_name, $newest_time ) = ( $file, -M _ ) if( ! defined $newest_time or -M $path < $newest_time );
+  }
+
+  closedir $dh;
+
+  $latest_file_name    = File::Spec->catfile($complete_path, $newest_name);
+  my $filesize         = stat($latest_file_name)->size;
+
+  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) {
+    $::lxdebug->leave_sub();
+    return;
+  }
+
+  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 (!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 {
+  return POSIX::strftime('_%Y%m%d_%H%M%S', localtime());
+}
+
 1;
 __END__