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

diff --git a/SL/Common.pm b/SL/Common.pm
index bcf68dc71..33d4d41cf 100644
--- a/SL/Common.pm
+++ b/SL/Common.pm
@@ -12,11 +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::Copy ();
 use File::stat;
 use File::Slurp;
+use File::Spec;
+use List::MoreUtils qw(apply);
+use POSIX ();
+use Encode qw(decode);
 
 use SL::DBUtils;
 
@@ -329,12 +334,6 @@ sub mkdir_with_parents {
   $main::lxdebug->leave_sub();
 }
 
-#
-# Legt ein entsprechendes Webdav-Verzeichnis an, falls
-# Webdav als Option konfiguriert ist. Falls schon ein
-# Ordner vorhanden ist, werden alle Dateien alphabetisch
-# sortiert ausgelesen und an der Oberfläche angezeigt
-#
 sub webdav_folder {
   $main::lxdebug->enter_sub();
 
@@ -347,7 +346,7 @@ sub webdav_folder {
 
   $form->{WEBDAV} = [];
 
-  my ($path, $number) = get_webdav_folder($form);     # ausgelagert
+  my ($path, $number) = get_webdav_folder($form);
   return $main::lxdebug->leave_sub() unless ($path && $number);
 
   if (!-d $path) {
@@ -357,8 +356,7 @@ sub webdav_folder {
     my $base_path = $ENV{'SCRIPT_NAME'};
     $base_path =~ s|[^/]+$||;
     if (opendir my $dir, $path) {
-      # alphabetisch sortiert.
-      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;
@@ -399,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);
 
@@ -559,14 +559,6 @@ sub check_params_x {
   }
 }
 
-#
-# Diese Routine baut aus dem Masken-Typ und der
-# Beleg-Nummer, das entsprechende Webdav-Verzeichnis zusammen
-# Nimmt leider noch die ganze Form entgegen und den if-elsif-Block
-# sollte man schöner "dispatchen"
-# Ergänzung 6.5.2011, den else-Zweig defensiver gestaltet und mit
-# -1 als n.i.O. Rückgabewert versehen
-#
 sub get_webdav_folder {
   $main::lxdebug->enter_sub();
 
@@ -596,9 +588,6 @@ sub get_webdav_folder {
   } elsif ($form->{vc} eq "vendor") {
     ($path, $number) = ("einkaufsrechnungen", $form->{invnumber});
   } else {
-    # wir befinden uns nicht in einer belegmaske
-    # scheinbar wird diese routine auch bspw. bei waren
-    # aufgerufen - naja, steuerung über die $form halt ...
     $main::lxdebug->leave_sub();
     return undef;
   }
@@ -612,80 +601,74 @@ sub get_webdav_folder {
   return ($path, $number);
 }
 
-#
-# Falls Webdav aktiviert ist, auch den generierten Beleg in das
-# Webdav-Verzeichnis kopieren
-#
-#
 sub copy_file_to_webdav_folder {
-  $main::lxdebug->enter_sub();
+  $::lxdebug->enter_sub();
 
   my ($form) = @_;
   my ($last_mod_time, $latest_file_name, $complete_path);
 
   # checks
   foreach my $item (qw(tmpdir tmpfile type)){
-    if (!$form->{$item}){
-      $main::lxdebug->message(0, 'Missing parameter');
-      $main::form->error($main::locale->text("Missing parameter for webdav file copy"));
-    }
+    next if $form->{$item};
+    $::lxdebug->message(LXDebug::WARN(), 'Missing parameter');
+    $::form->error($::locale->text("Missing parameter for WebDAV file copy"));
   }
 
-  # Den Webdav-Ordner ÜBER exakt denselben Mechanismus wie beim
-  # Anlegen des Ordners bestimmen
   my ($webdav_folder, $document_name) =  get_webdav_folder($form);
 
   if (! $webdav_folder){
-    $main::lxdebug->leave_sub();
-    $main::form->error($main::locale->text("Cannot check correct webdav folder"));
-    return undef; # s.o. erstmal so ...
+    $::lxdebug->leave_sub();
+    $::form->error($::locale->text("Cannot check correct WebDAV folder"));
+    return undef;
   }
-  # kompletter pfad
-  $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);
   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 );
-    }
-  $latest_file_name = $complete_path .'/' . $newest_name;
-  my $filesize = stat($latest_file_name)->size;
-
-  # prüfung auf identisch oder nicht
-  my ($ext) = $form->{tmpfile} =~ /(\.[^.]+)$/;
-  my $current_file = join('/', $form->{tmpdir}, $form->{tmpfile});
-  my $current_filesize = stat($current_file)->size;
-  if ($current_filesize == $filesize) { # bei gleicher größe copy deaktivieren
-    $main::lxdebug->leave_sub();
+    ( $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;
   }
-  # zeitstempel und dateinamen holen
-  my $timestamp = get_current_formatted_time();
-  my $myfilename = $form->generate_attachment_filename();
-  # entsprechend vor der endung hinzufügen
-  $myfilename =~ s/\./$timestamp\./;
 
-  if (!copy(join('/', $form->{tmpdir}, $form->{tmpfile}), join('/', $form->{cwd}, $webdav_folder, $myfilename))) {
-    my $j = join('/', $form->{tmpdir}, $form->{tmpfile});
-    my $k = join('/', $form->{cwd},  $webdav_folder);
-    $main::lxdebug->message(0, "Copy file from $j to $k failed");
-    $main::form->error($main::locale->text("Copy file from #1 to #2 failed", $j, $k));
+  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));
   }
 
-  $main::lxdebug->leave_sub();
+  $::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;