Merge branch 'master' of github.com:kivitendo/kivitendo-erp

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

diff --git a/SL/Common.pm b/SL/Common.pm
index dc1cc04..e63b698 100644 (file)
--- a/SL/Common.pm
+++ b/SL/Common.pm
@@ -11,32 +11,12 @@ package Common;
 use utf8;
 use strict;
 
+use Carp;
 use Time::HiRes qw(gettimeofday);
 use Data::Dumper;
 
 use SL::DBUtils;
 
-use vars qw(@db_encodings %db_encoding_to_charset %charset_to_db_encoding);
-
-@db_encodings = (
-  { "label" => "ASCII",          "dbencoding" => "SQL_ASCII", "charset" => "ASCII" },
-  { "label" => "UTF-8 Unicode",  "dbencoding" => "UNICODE",   "charset" => "UTF-8" },
-  { "label" => "ISO 8859-1",     "dbencoding" => "LATIN1",    "charset" => "ISO-8859-1" },
-  { "label" => "ISO 8859-2",     "dbencoding" => "LATIN2",    "charset" => "ISO-8859-2" },
-  { "label" => "ISO 8859-3",     "dbencoding" => "LATIN3",    "charset" => "ISO-8859-3" },
-  { "label" => "ISO 8859-4",     "dbencoding" => "LATIN4",    "charset" => "ISO-8859-4" },
-  { "label" => "ISO 8859-5",     "dbencoding" => "LATIN5",    "charset" => "ISO-8859-5" },
-  { "label" => "ISO 8859-15",    "dbencoding" => "LATIN9",    "charset" => "ISO-8859-15" },
-  { "label" => "KOI8-R",         "dbencoding" => "KOI8",      "charset" => "KOI8-R" },
-  { "label" => "Windows CP1251", "dbencoding" => "WIN",       "charset" => "CP1251" },
-  { "label" => "Windows CP866",  "dbencoding" => "ALT",       "charset" => "CP866" },
-);
-
-%db_encoding_to_charset = map { $_->{dbencoding}, $_->{charset} } @db_encodings;
-%charset_to_db_encoding = map { $_->{charset}, $_->{dbencoding} } @db_encodings;
-
-use constant DEFAULT_CHARSET => 'ISO-8859-15';
-
 sub unique_id {
   my ($a, $b) = gettimeofday();
   return "${a}-${b}-${$}";
@@ -354,6 +334,8 @@ sub webdav_folder {
   return $main::lxdebug->leave_sub()
     unless ($::lx_office_conf{features}->{webdav} && $form->{id});
 
+  croak "No client set in \$::auth" unless $::auth->client;
+
   my ($path, $number);
 
   $form->{WEBDAV} = [];
@@ -382,7 +364,7 @@ sub webdav_folder {
 
   $number =~ s|[/\\]|_|g;
 
-  $path = "webdav/${path}/${number}";
+  $path = "webdav/" . $::auth->client->{id} . "/${path}/${number}";
 
   if (!-d $path) {
     mkdir_with_parents($path);
@@ -390,7 +372,6 @@ sub webdav_folder {
   } else {
     my $base_path = $ENV{'SCRIPT_NAME'};
     $base_path =~ s|[^/]+$||;
-    # wo kommt der wert für dir her? es wird doch gar nichts übergeben? fix für strict my $dir jb 21.2.
     if (opendir my $dir, $path) {
       foreach my $file (sort { lc $a cmp lc $b } readdir $dir) {
         next if (($file eq '.') || ($file eq '..'));