X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FCommon.pm;h=826581e74cce409050a148f12eb44f85f37e417c;hb=2ff471a7b78c1085bbc0adff525fbf589127d819;hp=33a6e2a6af291409fcadfca84b327c69f47c26b9;hpb=b61db412d0d913a4fcecbce6678710ad0eb76cf6;p=kivitendo-erp.git diff --git a/SL/Common.pm b/SL/Common.pm index 33a6e2a6a..826581e74 100644 --- a/SL/Common.pm +++ b/SL/Common.pm @@ -28,11 +28,11 @@ sub retrieve_parts { my (@filter_values, $filter); if ($form->{"partnumber"}) { - $filter .= " AND (partnumber ILIKE ?)"; + $filter .= qq| AND (partnumber ILIKE ?)|; push(@filter_values, '%' . $form->{"partnumber"} . '%'); } if ($form->{"description"}) { - $filter .= " AND (description ILIKE ?)"; + $filter .= qq| AND (description ILIKE ?)|; push(@filter_values, '%' . $form->{"description"} . '%'); } substr($filter, 1, 3) = "WHERE" if ($filter); @@ -40,7 +40,10 @@ sub retrieve_parts { $order_by =~ s/[^a-zA-Z_]//g; $order_dir = $order_dir ? "ASC" : "DESC"; - my $query = "SELECT id, partnumber, description FROM parts $filter ORDER BY $order_by $order_dir"; + my $query = + qq|SELECT id, partnumber, description | . + qq|FROM parts $filter | . + qq|ORDER BY $order_by $order_dir|; my $sth = $dbh->prepare($query); $sth->execute(@filter_values) || $form->dberror($query . " (" . join(", ", @filter_values) . ")"); my $parts = []; @@ -64,11 +67,11 @@ sub retrieve_projects { my (@filter_values, $filter); if ($form->{"projectnumber"}) { - $filter .= " AND (projectnumber ILIKE ?)"; + $filter .= qq| AND (projectnumber ILIKE ?)|; push(@filter_values, '%' . $form->{"projectnumber"} . '%'); } if ($form->{"description"}) { - $filter .= " AND (description ILIKE ?)"; + $filter .= qq| AND (description ILIKE ?)|; push(@filter_values, '%' . $form->{"description"} . '%'); } substr($filter, 1, 3) = "WHERE" if ($filter); @@ -76,7 +79,10 @@ sub retrieve_projects { $order_by =~ s/[^a-zA-Z_]//g; $order_dir = $order_dir ? "ASC" : "DESC"; - my $query = "SELECT id, projectnumber, description FROM project $filter ORDER BY $order_by $order_dir"; + my $query = + qq|SELECT id, projectnumber, description | . + qq|FROM project $filter | . + qq|ORDER BY $order_by $order_dir|; my $sth = $dbh->prepare($query); $sth->execute(@filter_values) || $form->dberror($query . " (" . join(", ", @filter_values) . ")"); my $projects = []; @@ -100,7 +106,7 @@ sub retrieve_employees { my (@filter_values, $filter); if ($form->{"name"}) { - $filter .= " AND (name ILIKE ?)"; + $filter .= qq| AND (name ILIKE ?)|; push(@filter_values, '%' . $form->{"name"} . '%'); } substr($filter, 1, 3) = "WHERE" if ($filter); @@ -108,7 +114,10 @@ sub retrieve_employees { $order_by =~ s/[^a-zA-Z_]//g; $order_dir = $order_dir ? "ASC" : "DESC"; - my $query = "SELECT id, name FROM employee $filter ORDER BY $order_by $order_dir"; + my $query = + qq|SELECT id, name | . + qq|FROM employee $filter | . + qq|ORDER BY $order_by $order_dir|; my $sth = $dbh->prepare($query); $sth->execute(@filter_values) || $form->dberror($query . " (" . join(", ", @filter_values) . ")"); my $employees = []; @@ -132,17 +141,21 @@ sub retrieve_delivery_customer { my (@filter_values, $filter); if ($form->{"name"}) { - $filter .= " (name ILIKE '%$form->{name}%') AND"; + $filter .= qq| (name ILIKE ?) AND|; push(@filter_values, '%' . $form->{"name"} . '%'); } - #substr($filter, 1, 3) = "WHERE" if ($filter); $order_by =~ s/[^a-zA-Z_]//g; $order_dir = $order_dir ? "ASC" : "DESC"; - my $query = "SELECT id, name, customernumber, (street || ', ' || zipcode || city) as address FROM customer WHERE $filter business_id=(SELECT id from business WHERE description='Endkunde') ORDER BY $order_by $order_dir"; + my $query = + qq!SELECT id, name, customernumber, (street || ', ' || zipcode || city) AS address ! . + qq!FROM customer ! . + qq!WHERE $filter business_id = (SELECT id FROM business WHERE description = 'Endkunde') ! . + qq!ORDER BY $order_by $order_dir!; my $sth = $dbh->prepare($query); - $sth->execute() || $form->dberror($query . " (" . join(", ", @filter_values) . ")"); + $sth->execute(@filter_values) || + $form->dberror($query . " (" . join(", ", @filter_values) . ")"); my $delivery_customers = []; while (my $ref = $sth->fetchrow_hashref()) { push(@{$delivery_customers}, $ref); @@ -164,17 +177,20 @@ sub retrieve_vendor { my (@filter_values, $filter); if ($form->{"name"}) { - $filter .= " (name ILIKE '%$form->{name}%') AND"; + $filter .= qq| (name ILIKE ?) AND|; push(@filter_values, '%' . $form->{"name"} . '%'); } - #substr($filter, 1, 3) = "WHERE" if ($filter); $order_by =~ s/[^a-zA-Z_]//g; $order_dir = $order_dir ? "ASC" : "DESC"; - my $query = "SELECT id, name, customernumber, (street || ', ' || zipcode || city) as address FROM customer WHERE $filter business_id=(SELECT id from business WHERE description='Händler') ORDER BY $order_by $order_dir"; + 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!ORDER BY $order_by $order_dir!; my $sth = $dbh->prepare($query); - $sth->execute() || $form->dberror($query . " (" . join(", ", @filter_values) . ")"); + $sth->execute(@filter_values) || + $form->dberror($query . " (" . join(", ", @filter_values) . ")"); my $vendors = []; while (my $ref = $sth->fetchrow_hashref()) { push(@{$vendors}, $ref); @@ -187,4 +203,80 @@ sub retrieve_vendor { return $vendors; } +sub mkdir_with_parents { + $main::lxdebug->enter_sub(); + + my ($full_path) = @_; + + my $path = ""; + + $full_path =~ s|/+|/|; + + foreach my $part (split(m|/|, $full_path)) { + $path .= "/" if ($path); + $path .= $part; + + die("Could not create directory '$path' because a file exists with " . + "the same name.\n") if (-f $path); + + if (! -d $path) { + mkdir($path, 0770) || die("Could not create the directory '$path'. " . + "OS error: $!\n"); + } + } + + $main::lxdebug->leave_sub(); +} + +sub webdav_folder { + $main::lxdebug->enter_sub(); + + my ($form) = @_; + + return $main::lxdebug->leave_sub() + unless ($main::webdav && $form->{id}); + + 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 "credit_note") { + ($path, $number) = ("gutschriften", $form->{invnumber}); + } elsif ($form->{vc} eq "customer") { + ($path, $number) = ("rechnungen", $form->{invnumber}); + } else { + ($path, $number) = ("einkaufsrechnungen", $form->{invnumber}); + } + + return $main::lxdebug->leave_sub() unless ($path && $number); + + $path = "webdav/${path}/${number}"; + + if (!-d $path) { + mkdir_with_parents($path); + + } else { + my $base_path = substr($ENV{'SCRIPT_NAME'}, 1); + $base_path =~ s|[^/]+$||; + + foreach my $file (<$path/*>) { + my $fname = $file; + $fname =~ s|.*/||; + $form->{WEBDAV}{$fname} = + ($ENV{"HTTPS"} ? "https://" : "http://") . + $ENV{'SERVER_NAME'} . "/" . $base_path . $file; + } + } + + $main::lxdebug->leave_sub(); +} + 1;