X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/blobdiff_plain/40db40e8dab881065df1cfbe61bb2212de0ff6db..8b68b3f8f2cc88d620b484a2219c85f6ff4d78a8:/SL/Form.pm diff --git a/SL/Form.pm b/SL/Form.pm index db2cb4907..fe9d2b862 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -143,7 +143,6 @@ sub new { $self->{action} =~ s/( |-|,|#)/_/g; $self->{version} = "2.2.0"; - $self->{dbversion} = "2.2.0"; $main::lxdebug->leave_sub(); @@ -198,7 +197,7 @@ sub quote { my ($self, $str) = @_; if ($str && !ref($str)) { - $str =~ s/"/"/g; + $str =~ s/\"/"/g; } $str; @@ -209,7 +208,7 @@ sub unquote { my ($self, $str) = @_; if ($str && !ref($str)) { - $str =~ s/"/"/g; + $str =~ s/"/\"/g; } $str; @@ -245,17 +244,7 @@ sub error { $msg =~ s/\n/
/g; $self->header; - - print qq| - - -

Error!

- -

$msg - - - - |; + $self->show_generic_error($msg); die "Error: $msg\n"; @@ -421,19 +410,38 @@ function fokus(){document.$self->{fokus}.focus();} $main::lxdebug->leave_sub(); } +use Data::Dumper; sub parse_html_template { $main::lxdebug->enter_sub(); - my ($self, $myconfig, $file) = @_; + my ($self, $file, $additional_params) = @_; + my $language; - if (-f "templates/webpages/${file}_" . $myconfig->{"countrycode"} . - ".html") { - $file = "templates/webpages/${file}_" . $myconfig->{"countrycode"} . - ".html"; + if (!defined($main::myconfig) || !defined($main::myconfig{"countrycode"})) { + $language = $main::language; + } else { + $language = $main::myconfig{"countrycode"}; + } + + if (-f "templates/webpages/${file}_${language}.html") { + if ((-f ".developer") && + (-f "templates/webpages/${file}_master.html") && + ((stat("templates/webpages/${file}_master.html"))[9] > + (stat("templates/webpages/${file}_${language}.html"))[9])) { + my $info = "Developper information: templates/webpages/${file}_master.html is newer than the localized version.\n" . + "Please re-run 'locales.pl' in 'locale/${language}'."; + print(qq|

$info
|); + die($info); + } + + $file = "templates/webpages/${file}_${language}.html"; } elsif (-f "templates/webpages/${file}.html") { $file = "templates/webpages/${file}.html"; } else { - $self->error("Web page template '${file}' not found."); + my $info = "Web page template '${file}' not found.\n" . + "Please re-run 'locales.pl' in 'locale/${language}'."; + print(qq|
$info
|); + die($info); } my $template = HTML::Template->new("filename" => $file, @@ -442,15 +450,23 @@ sub parse_html_template { "case_sensitive" => 1, "loop_context_vars" => 1, "global_vars" => 1); - my @params = $template->param(); - if (grep("DEBUG", @params) && $self->{"DEBUG"}) { - $template->param("DEBUG" => "
DEBUG INFORMATION:
" .
-                     $self->{"DEBUG"} . "
"); + $additional_params = {} unless ($additional_params); + if ($self->{"DEBUG"}) { + $additional_params->{"DEBUG"} = $self->{"DEBUG"}; } - foreach my $key (keys(%{$self})) { - if (("DEBUG" ne $key) && grep(${key}, @params)) { + if ($additional_params->{"DEBUG"}) { + $additional_params->{"DEBUG"} = + "
DEBUG INFORMATION:
" . $additional_params->{"DEBUG"} . "
"; + } + + my @additional_param_names = keys(%{$additional_params}); + + foreach my $key ($template->param()) { + if (grep(/^${key}$/, @additional_param_names)) { + $template->param($key => $additional_params->{$key}); + } else { $template->param($key => $self->{$key}); } } @@ -463,12 +479,13 @@ sub parse_html_template { } sub show_generic_error { - my ($self, $myconfig, $error, $title) = @_; + my ($self, $error, $title) = @_; - $self->{"title"} = $title if ($title); + my $add_params = {}; + $add_params->{"title"} = $title if ($title); $self->{"label_error"} = $error; - print($self->parse_html_template($myconfig, "generic/error")); + print($self->parse_html_template("generic/error", $add_params)); } # write Trigger JavaScript-Code ($qty = quantity of Triggers) @@ -675,7 +692,7 @@ sub parse_amount { } if ($myconfig->{numberformat} eq "1'000.00") { - $amount =~ s/'//g; + $amount =~ s/\'//g; } $amount =~ s/,//g;