diff options
-rwxr-xr-x | httpd/cgi-bin/check | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check index b413924..45e9f30 100755 --- a/httpd/cgi-bin/check +++ b/httpd/cgi-bin/check @@ -14,7 +14,7 @@ # This source code is available under the license at: # http://www.w3.org/Consortium/Legal/copyright-software # -# $Id: check,v 1.611 2009-01-03 21:09:31 ville Exp $ +# $Id: check,v 1.612 2009-01-04 10:23:10 ville Exp $ # # Disable buffering on STDOUT! @@ -198,7 +198,7 @@ Directory not readable (permission denied): @_r # # Strings - $VERSION = q$Revision: 1.611 $; + $VERSION = q$Revision: 1.612 $; $VERSION =~ s/Revision: ([\d\.]+) /$1/; # @@ -320,6 +320,7 @@ if ($lang eq "en") { my %template_defaults = ( die_on_bad_params => FALSE, cache => TRUE, + filter => sub { my $ref = shift; ${$ref} = Encode::decode_utf8(${$ref}); }, ); $File->{Templates}->{Result} = HTML::Template->new( @@ -327,22 +328,16 @@ $File->{Templates}->{Result} = HTML::Template->new( filename => File::Spec->catfile($CFG->{Paths}->{Templates}, $lang, 'result.tmpl'), loop_context_vars => TRUE, - filter => sub { - my $ref = shift; - ${$ref} = Encode::decode_utf8(${$ref}); - } ); $File->{Templates}->{Error} = HTML::Template->new( %template_defaults, filename => File::Spec->catfile($CFG->{Paths}->{Templates}, $lang, 'fatal-error.tmpl'), - filter => sub { my $ref = shift;${$ref} = Encode::decode_utf8(${$ref});} ); $File->{Templates}->{AuthzReq} = HTML::Template->new( %template_defaults, filename => File::Spec->catfile($CFG->{Paths}->{Templates}, $lang, 'http_401_authrequired.tmpl'), - filter => sub { my $ref = shift;${$ref} = Encode::decode_utf8(${$ref});} ); # templates for alternate output formats @@ -351,35 +346,30 @@ $File->{Templates}->{XML} = HTML::Template->new( filename => File::Spec->catfile($CFG->{Paths}->{Templates}, $lang, 'xml_output.tmpl'), loop_context_vars => TRUE, - filter => sub { my $ref = shift;${$ref} = Encode::decode_utf8(${$ref});} ); $File->{Templates}->{SOAP} = HTML::Template->new( %template_defaults, filename => File::Spec->catfile($CFG->{Paths}->{Templates}, $lang, 'soap_output.tmpl'), loop_context_vars => TRUE, - filter => sub { my $ref = shift;${$ref} = Encode::decode_utf8(${$ref});} ); $File->{Templates}->{UCN} = HTML::Template->new( %template_defaults, filename => File::Spec->catfile($CFG->{Paths}->{Templates}, $lang, 'ucn_output.tmpl'), loop_context_vars => TRUE, - filter => sub { my $ref = shift;${$ref} = Encode::decode_utf8(${$ref});} ); $File->{Templates}->{SOAPFault} = HTML::Template->new( %template_defaults, filename => File::Spec->catfile($CFG->{Paths}->{Templates}, $lang, 'soap_fault.tmpl'), loop_context_vars => TRUE, - filter => sub { my $ref = shift;${$ref} = Encode::decode_utf8(${$ref});} ); $File->{Templates}->{SOAPDisabled} = HTML::Template->new( %template_defaults, filename => File::Spec->catfile($CFG->{Paths}->{Templates}, $lang, 'soap_disabled.tmpl'), loop_context_vars => TRUE, - filter => sub { my $ref = shift;${$ref} = Encode::decode_utf8(${$ref});} ); $File->{Templates}->{EARLXML} = HTML::Template->new( %template_defaults, @@ -387,7 +377,6 @@ $File->{Templates}->{EARLXML} = HTML::Template->new( $lang, 'earl_xml.tmpl'), loop_context_vars => TRUE, global_vars => TRUE, - filter => sub { my $ref = shift;${$ref} = Encode::decode_utf8(${$ref});} ); $File->{Templates}->{EARLN3} = HTML::Template->new( %template_defaults, @@ -395,7 +384,6 @@ $File->{Templates}->{EARLN3} = HTML::Template->new( $lang, 'earl_n3.tmpl'), loop_context_vars => TRUE, global_vars => TRUE, - filter => sub { my $ref = shift;${$ref} = Encode::decode_utf8(${$ref});} ); $File->{Templates}->{JSON} = HTML::Template->new( %template_defaults, @@ -403,7 +391,6 @@ $File->{Templates}->{JSON} = HTML::Template->new( $lang, 'json_ouput.tmpl'), loop_context_vars => TRUE, global_vars => TRUE, - filter => sub { my $ref = shift;${$ref} = Encode::decode_utf8(${$ref});} ); $File->{Templates}->{PrefillHTML} = HTML::Template->new( %template_defaults, @@ -411,7 +398,6 @@ $File->{Templates}->{PrefillHTML} = HTML::Template->new( $lang, 'prefill_html401.tmpl'), loop_context_vars => TRUE, global_vars => TRUE, - filter => sub { my $ref = shift;${$ref} = Encode::decode_utf8(${$ref});} ); $File->{Templates}->{PrefillXHTML} = HTML::Template->new( %template_defaults, @@ -419,7 +405,6 @@ $File->{Templates}->{PrefillXHTML} = HTML::Template->new( $lang, 'prefill_xhtml10.tmpl'), loop_context_vars => TRUE, global_vars => TRUE, - filter => sub { my $ref = shift;${$ref} = Encode::decode_utf8(${$ref});} ); $File->{Templates}->{Result}->param(cfg_home_page => $CFG->{'Home Page'}); |