diff options
Diffstat (limited to 'httpd/cgi-bin/check')
| -rwxr-xr-x | httpd/cgi-bin/check | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check index b0bf649..0c1b83d 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.720 2009-11-23 22:15:18 ville Exp $ +# $Id: check,v 1.721 2009-11-23 22:24:15 ville Exp $ # # Disable buffering on STDOUT! $| = 1; @@ -132,11 +132,11 @@ BEGIN { $CFG = \%cfg; }; if ($@) { - die <<".EOF."; + die <<EOF; Could not read configuration. Set the W3C_VALIDATOR_CFG environment variable or copy conf/* to /etc/w3c/. Make sure that the configuration file and all included files are readable by the web server user. The error was:\n'$@' -.EOF. +EOF } # @@ -146,13 +146,13 @@ included files are readable by the web server user. The error was:\n'$@' my %paths = map { $_ => [-d $_, -r _] } @_; my @_d = grep { not $paths{$_}->[0] } keys %paths; my @_r = grep { not $paths{$_}->[1] } keys %paths; - return TRUE if (scalar(@_d) + scalar(@_r) == 0); - die <<".EOF." if scalar @_d; + return TRUE if (scalar(@_d) + scalar(@_r) == 0); + die <<EOF if scalar @_d; Does not exist or is not a directory: @_d -.EOF. - die <<".EOF." if scalar @_r; +EOF + die <<EOF if scalar @_r; Directory not readable (permission denied): @_r -.EOF. +EOF } # @@ -215,7 +215,7 @@ Directory not readable (permission denied): @_r # # Strings - $VERSION = q$Revision: 1.720 $; + $VERSION = q$Revision: 1.721 $; $VERSION =~ s/Revision: ([\d\.]+) /$1/; # @@ -1509,9 +1509,10 @@ sub fin_template ($$) ) { - my $default_doctype = - (&is_xml($File) ? $File->{"Default DOCTYPE"}->{"XHTML"} : - $File->{"Default DOCTYPE"}->{"HTML"}); + my $default_doctype = ( + &is_xml($File) ? $File->{"Default DOCTYPE"}->{"XHTML"} : + $File->{"Default DOCTYPE"}->{"HTML"} + ); $T->param(file_version => "$default_doctype"); } else { @@ -2910,7 +2911,8 @@ sub charset_conflicts } elsif ( charset_not_equal($File->{Charset}->{HTTP}, $File->{Charset}->{META}) - and not($File->{'Direct Input'})) + and + not($File->{'Direct Input'})) { &add_warning( 'W19', @@ -3422,9 +3424,10 @@ sub error # No DOCTYPE found! We are falling back to vanilla DTD if ($err->{msg} =~ m(prolog can\'t be omitted)) { if (lc($File->{Root}) eq 'html') { - my $dtd = - ($is_xml ? $File->{"Default DOCTYPE"}->{"XHTML"} : - $File->{"Default DOCTYPE"}->{"HTML"}); + my $dtd = ( + $is_xml ? $File->{"Default DOCTYPE"}->{"XHTML"} : + $File->{"Default DOCTYPE"}->{"HTML"} + ); W3C::Validator::MarkupValidator::add_warning('W09', {W09_dtd => $dtd}); } |