X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FCommon.pm;h=726c4c8e2576a04e32994be364df8357c6f5cf05;hb=6669edf8fb3d3e7e917aca49fa9b1e8387b0943a;hp=664bc6a08be95827a415e0b65783d89c8012880a;hpb=267cb60760ce2aba540556973b16430156342fb5;p=kivitendo-erp.git

diff --git a/SL/Common.pm b/SL/Common.pm
index 664bc6a08..726c4c8e2 100644
--- a/SL/Common.pm
+++ b/SL/Common.pm
@@ -8,6 +8,9 @@
 
 package Common;
 
+use utf8;
+use strict;
+
 use Time::HiRes qw(gettimeofday);
 use Data::Dumper;
 
@@ -15,8 +18,6 @@ use SL::DBUtils;
 
 use vars qw(@db_encodings %db_encoding_to_charset %charset_to_db_encoding);
 
-use strict;
-
 @db_encodings = (
   { "label" => "ASCII",          "dbencoding" => "SQL_ASCII", "charset" => "ASCII" },
   { "label" => "UTF-8 Unicode",  "dbencoding" => "UNICODE",   "charset" => "UTF-8" },
@@ -42,7 +43,7 @@ sub unique_id {
 }
 
 sub tmpname {
-  return "/tmp/lx-office-tmp-" . unique_id();
+  return "/tmp/kivitendo-tmp-" . unique_id();
 }
 
 sub retrieve_parts {
@@ -286,8 +287,9 @@ sub retrieve_vendor {
 
   my $query =
     qq!SELECT id, name, customernumber, (street || ', ' || zipcode || city) AS address FROM customer ! .
-    qq!WHERE $filter business_id = (SELECT id FROM business WHERE description = 'Händler') ! .
+    qq!WHERE $filter business_id = (SELECT id FROM business WHERE description = ?') ! .
     qq!ORDER BY $order_by $order_dir!;
+  push @filter_values, $::locale->{iconv_utf8}->convert('Händler');
   my $sth = $dbh->prepare($query);
   $sth->execute(@filter_values) ||
     $form->dberror($query . " (" . join(", ", @filter_values) . ")");
@@ -334,7 +336,7 @@ sub webdav_folder {
   my ($form) = @_;
 
   return $main::lxdebug->leave_sub()
-    unless ($main::webdav && $form->{id});
+    unless ($::lx_office_conf{features}->{webdav} && $form->{id});
 
   my ($path, $number);
 
@@ -370,10 +372,9 @@ sub webdav_folder {
     mkdir_with_parents($path);
 
   } else {
-    my $base_path = substr($ENV{'SCRIPT_NAME'}, 1);
+    my $base_path = $ENV{'SCRIPT_NAME'};
     $base_path =~ s|[^/]+$||;
-    $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.
+    # 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 '..'));
@@ -388,7 +389,7 @@ sub webdav_folder {
 
         push @{ $form->{WEBDAV} }, {
           'name' => $fname,
-          'link' => "/$base_path/$file",
+          'link' => $base_path . $file,
           'type' => $is_directory ? $main::locale->text('Directory') : $main::locale->text('File'),
         };
       }
@@ -495,8 +496,8 @@ sub save_email_status {
 
   $intnotes .= "\n\n" if ($intnotes);
 
-  my $cc  = $main::locale->text('Cc') . ": $form->{cc}\n"   if $form->{cc};
-  my $bcc = $main::locale->text('Bcc') . ": $form->{bcc}\n" if $form->{bcc};
+  my $cc  = $form->{cc}  ? $main::locale->text('Cc') . ": $form->{cc}\n"   : '';
+  my $bcc = $form->{bcc} ? $main::locale->text('Bcc') . ": $form->{bcc}\n" : '';
   my $now = scalar localtime;
 
   $intnotes .= $main::locale->text('[email]') . "\n"