Webdav: Wenn eine Pfadkomponente Leerzeichen enthielt (z.B. "Storno zu ..."), dann...

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

diff --git a/SL/Common.pm b/SL/Common.pm
index fdf2b28..c67c58c 100644 (file)
--- a/SL/Common.pm
+++ b/SL/Common.pm
@@ -280,6 +280,8 @@ sub webdav_folder {
 
   return $main::lxdebug->leave_sub() unless ($path && $number);
 
+  $number =~ s|[/\\]|_|g;
+
   $path = "webdav/${path}/${number}";
 
   if (!-d $path) {
@@ -288,13 +290,24 @@ sub webdav_folder {
   } else {
     my $base_path = substr($ENV{'SCRIPT_NAME'}, 1);
     $base_path =~ s|[^/]+$||;
+    $base_path =~ s|/$||;
+
+    if (opendir $dir, $path) {
+      foreach my $file (readdir $dir) {
+        next if (($file eq '.') || ($file eq '..'));
+
+        my $fname = $file;
+        $fname  =~ s|.*/||;
+
+        my $physical_file = "$path/$file";
+
+        $file  = join('/', map { $form->escape($_) } grep { $_ } split m|/+|, "$path/$file");
+        $file .=  '/' if (-d $physical_file);
+
+        $form->{WEBDAV}->{$fname} = ($ENV{"HTTPS"} ? "https://" : "http://") . $ENV{'SERVER_NAME'} . "/$base_path/$file";
+      }
 
-    foreach my $file (<$path/*>) {
-      my $fname = $file;
-      $fname =~ s|.*/||;
-      $form->{WEBDAV}{$fname} =
-        ($ENV{"HTTPS"} ? "https://" : "http://") .
-        $ENV{'SERVER_NAME'} . "/" . $base_path . $file;
+      closedir $dir;
     }
   }