X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FForm.pm;h=a36ffd5dfb955c4f0543e8f794a0012173811439;hb=5e96049428deceda2ef857930bbf67311deccbcb;hp=eb3565d44e7530e0031f511580312c55651bfbf4;hpb=abe89aaca4356b4860f4623410e70f50b3c4d631;p=kivitendo-erp.git diff --git a/SL/Form.pm b/SL/Form.pm index eb3565d44..a36ffd5df 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -40,6 +40,7 @@ package Form; use Carp; use Data::Dumper; +use Carp; use CGI; use Cwd; use Encode; @@ -307,8 +308,7 @@ sub error { $self->show_generic_error($msg); } else { - print STDERR "Error: $msg\n"; - ::end_of_request(); + confess "Error: $msg\n"; } $main::lxdebug->leave_sub(); @@ -472,7 +472,7 @@ sub header { $layout->use_javascript("$_.js") for (qw( jquery jquery-ui jquery.cookie jquery.checkall jquery.download - jquery/jquery.form client_js + jquery/jquery.form jquery/fixes client_js common part_selection switchmenuframe autocomplete_part ), "jquery/ui/i18n/jquery.ui.datepicker-$::myconfig{countrycode}"); @@ -594,8 +594,11 @@ sub _prepare_html_template { if (-f "templates/webpages/${file}.html") { $file = "templates/webpages/${file}.html"; + } elsif (ref $file eq 'SCALAR') { + # file is a scalarref, use inline mode } else { my $info = "Web page template '${file}' not found.\n"; + $::form->header; print qq|
$info|; ::end_of_request(); } @@ -673,6 +676,7 @@ sub init_template { 'COMPILE_EXT' => '.tcc', 'COMPILE_DIR' => $::lx_office_conf{paths}->{userspath} . '/templates-cache', 'ERROR' => 'templates/webpages/generic/exception.html', + 'ENCODING' => 'utf8', })) || die; } @@ -694,7 +698,6 @@ sub show_generic_error { } if ($::request->is_ajax) { - $::lxdebug->message(0, "trying to render AJAX response..."); SL::ClientJS->new ->error($error) ->render(SL::Controller::Base->new); @@ -945,24 +948,32 @@ sub parse_amount { } sub round_amount { - $main::lxdebug->enter_sub(2); - my ($self, $amount, $places) = @_; - my $round_amount; # Rounding like "Kaufmannsrunden" (see http://de.wikipedia.org/wiki/Rundung ) # Round amounts to eight places before rounding to the requested # number of places. This gets rid of errors due to internal floating # point representation. - $amount = $self->round_amount($amount, 8) if $places < 8; - $amount = $amount * (10**($places)); - $round_amount = int($amount + .5 * ($amount <=> 0)) / (10**($places)); + $amount = $self->round_amount($amount, 8) if $places < 8; - $main::lxdebug->leave_sub(2); + # Remember the amount's sign but calculate in positive values only. + my $sign = $amount <=> 0; + $amount = abs $amount; + + # Shift the amount left by $places+1 decimal places and truncate it + # to integer. Then to the integer equivalent of rounding to the next + # multiple of 10: first add half of it (5). Then truncate it back to + # the lower multiple of 10 by subtracting $amount modulo 10. + my $shift = 10 ** ($places + 1); + $amount = int($amount * $shift) + 5; + $amount -= $amount % 10; - return $round_amount; + # Lastly shift the amount back right by $places+1 decimal places and + # restore its sign. Then we're done. + $amount = ($amount / $shift) * $sign; + return $amount; } sub parse_template { @@ -1019,7 +1030,8 @@ sub parse_template { file_name => $self->{IN}, form => $self, myconfig => $myconfig, - userspath => $userspath); + userspath => $userspath, + %{ $self->{TEMPLATE_DRIVER_OPTIONS} || {} }); # Copy the notes from the invoice/sales order etc. back to the variable "notes" because that is where most templates expect it to be. $self->{"notes"} = $self->{ $self->{"formname"} . "notes" }; @@ -1080,8 +1092,9 @@ sub parse_template { } close OUT if $self->{OUT}; - - my $copy_to_webdav = $::instance_conf->get_webdav && $::instance_conf->get_webdav_documents && !$self->{preview} && $self->{tmpdir} && $self->{tmpfile} && $self->{type}; + # check only one flag (webdav_documents) + # therefore copy to webdav, even if we do not have the webdav feature enabled (just archive) + my $copy_to_webdav = $::instance_conf->get_webdav_documents && !$self->{preview} && $self->{tmpdir} && $self->{tmpfile} && $self->{type}; if ($self->{media} eq 'file') { copy(join('/', $self->{cwd}, $userspath, $self->{tmpfile}), $out =~ m|^/| ? $out : join('/', $self->{cwd}, $out)) if $template->uses_temp_file; @@ -1105,15 +1118,16 @@ sub parse_template { $mail->{to} = $self->{EMAIL_RECIPIENT} ? $self->{EMAIL_RECIPIENT} : $self->{email}; $mail->{from} = qq|"$myconfig->{name}" <$myconfig->{email}>|; $mail->{fileid} = time() . '.' . $$ . '.'; - $myconfig->{signature} =~ s/\r//g; + my $full_signature = $self->create_email_signature(); + $full_signature =~ s/\r//g; # if we send html or plain text inline if (($self->{format} eq 'html') && ($self->{sendmode} eq 'inline')) { $mail->{contenttype} = "text/html"; $mail->{message} =~ s/\r//g; $mail->{message} =~ s/\n/