X-Git-Url: http://git.jankratochvil.net/?p=MyWeb.git;a=blobdiff_plain;f=Web.pm;h=8b1859c732524987eecb1af2963bfc9e4500c18f;hp=524cf143e94cc8cfa6a8ee8df4b85b4d6e50a5ee;hb=c79c6b5bfd4da403dc38e064c7ae50d9a0b67309;hpb=623f80a16fb1d68e2ec1d8e7033c194a3a5b2543 diff --git a/Web.pm b/Web.pm index 524cf14..8b1859c 100644 --- a/Web.pm +++ b/Web.pm @@ -1,6 +1,6 @@ # $Id$ # Common functions for HTML/XHTML output generation -# Copyright (C) 2003 Jan Kratochvil +# Copyright (C) 2003-2005 Jan Kratochvil # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -24,14 +24,26 @@ use strict; use warnings; use Exporter; -sub Wrequire ($); -sub Wuse ($@); +sub Wrequire($); +sub Wuse($@); our $W; -our @EXPORT=qw(&Wrequire &Wuse &a_href &a_href_cz &vskip &img ¢erimg &rightimg $W &top_dir &top_dir_disk); -our @ISA=qw(Exporter); +our @EXPORT=qw( + &Wrequire &Wuse + &path_web &path_abs_disk + &uri_escaped + &a_href &a_href_cz + &vskip + &img ¢erimg &rightimg + $W + &input_hidden_persistents + ); +our @ISA=qw(Tie::Handle Exporter); BEGIN { + use Carp qw(cluck confess); + $W->{"__My::Web_init"}=1; + sub Wrequire ($) { my($file)=@_; @@ -42,10 +54,20 @@ BEGIN my $class=$file; $file=~s#::#/#g; $file.=".pm"; - my $aref=($W->{"packages_used"}{$Apache::Registry::curstash}||=[]); - push @$aref,$class - if !{ map(($_=>1),@$aref) }->{$class}; # Prevent duplicated entries. - CORE::require $file; + my %callers; + for (my $depth=0;defined caller($depth);$depth++) { + $callers{caller($depth)}=1; + } + my $selfpkg=__PACKAGE__; + $callers{$selfpkg}=1; + for my $target ($class,__PACKAGE__) { + for my $caller (keys(%callers)) { + next if $caller eq $target; + next if $W->{'packages_used%'}{$caller}{$target}++; + push @{$W->{'packages_used@'}{$caller}},$target; + } + } + eval { CORE::require "$file"; } or confess $@; 1; # Otherwise 'require' would already file above. } @@ -59,9 +81,18 @@ BEGIN $file->import(@list); 1; } + + sub import + { + my($class,@rest)=@_; + + local $Exporter::ExportLevel=$Exporter::ExportLevel+1; + Wrequire("$class"); + return $class->SUPER::import(@rest); + } } -BEGIN { Wuse 'WebConfig'; } # for %WebConfig +use WebConfig; # see also below: Wuse 'WebConfig'; require CGI; # for &escapeHTML require Image::Size; # for &imgsize use File::Basename; # &basename @@ -69,91 +100,110 @@ use Carp qw(cluck confess); use URI::Escape; require HTTP::BrowserDetect; require HTTP::Negotiate; -require Geo::IP; -require CGI; - - -# Undo 'www/engine/httpd-restart' as it may use obsolete Perl for 'mod_perl' -delete $ENV{"PERLLIB"}; -delete $ENV{"LD_LIBRARY_PATH"}; +my $have_Geo_IP; BEGIN { $have_Geo_IP=eval { require Geo::IP; 1; }; } +# Do not: use ModPerl::Util qw(exit); +# to prevent in mod_perl2: "exit" is not exported by the ModPerl::Util module +# I do not know why. +use POSIX qw(strftime); +use Tie::Handle; +use Apache2::Const qw(HTTP_MOVED_TEMPORARILY); +use URI; +use URI::QueryParam; +use Cwd; #our $W; # $W->{"title"} # $W->{"head"} - # $W->{"head_css"} # $W->{"force_charset"} - # %{$W->{"packages_used"} # $W->{"heading_done"} # $W->{"footer_passed"} # %{$W->{"headers"}} # %{$W->{"headers_lc"}} # maps lc($headers_key)=>$headers_key - # @{$W->{"packages_used"}{$Apache::Registry::curstash}}} + # @{$W->{'packages_used@'}{callers...}} + # %{$W->{'packages_used%'}{callers...}} # %{$W->{"args"}} sub init ($%) { my($class,%args)=@_; - print STDERR "$class->init ".$ENV{"REQUEST_URI"}."\n"; + print STDERR "$class->init ".Apache2::RequestUtil->request()->unparsed_uri()."\n"; - my $packages_used_save=$W->{"packages_used"}; - $W={ %WebConfig,%args }; # override %WebConfig settings - $W->{"packages_used"}=$packages_used_save; + # We need to track package dependencies, so we need to call it from &init. + # We cannot do it in BEGIN { } block + # as it would not be tracked for each of the toplevel users later. + Wuse 'WebConfig'; + Wrequire 'My::Hash::Sub'; - $W->{"__PACKAGE__"}||="Apache::ROOT".$Apache::Registry::curstash; + my $packages_used_array_save=$W->{'packages_used@'}; + my $packages_used_hash_save =$W->{'packages_used%'}; + $W={}; + tie %$W,"My::Hash::Sub"; + %$W=(%WebConfig,%args); # override %WebConfig settings + $W->{'packages_used@'}=$packages_used_array_save; + $W->{'packages_used%'}=$packages_used_hash_save; + $W->{"__PACKAGE__"}||=caller(); - $W->{"top_dir"}||=eval '$'.$W->{"__PACKAGE__"}.'::top_dir'; + # {"__PACKAGE__"} is mandatory for mod_perl-2.0; + # $Apache2::Registry::curstash is no longer supported. + do { cluck "No $_" if !$W->{$_}; } for "__PACKAGE__"; do { $W->{$_}=0 if !defined $W->{$_}; } for ("detect_ent"); do { $W->{$_}=0 if !defined $W->{$_}; } for ("detect_js"); do { $W->{$_}=1 if !defined $W->{$_}; } for ("have_css"); # AFAIK it does not hurt anyone. - do { $W->{$_}=1 if !defined $W->{$_}; } for ("heading"); do { $W->{$_}=1 if !defined $W->{$_}; } for ("footer"); do { $W->{$_}=1 if !defined $W->{$_}; } for ("footer_delimit"); - do { $W->{$_}=1 if !defined $W->{$_}; } for ("footer_mailme"); do { $W->{$_}=1 if !defined $W->{$_}; } for ("footer_ids"); do { $W->{$_}=1 if !defined $W->{$_}; } for ("indexme"); do { $W->{$_}="" if !defined $W->{$_}; } for ("head"); - do { $W->{$_}="" if !defined $W->{$_}; } for ("head_css"); + do { $W->{$_}="" if !defined $W->{$_}; } for ("body_attr"); + do { $W->{$_}="en-US" if !defined $W->{$_}; } for ("language"); my $footer_any=0; - for (qw(footer_mailme footer_ids)) { + for (qw(footer_ids)) { $W->{$_}=0 if !$W->{"footer"}; $footer_any=1 if $W->{$_}; } $W->{"footer"}=0 if !$footer_any; $W->{"footer_delimit"}=0 if !$W->{"footer"}; - $W->{"r"}=Apache->request(); + $W->{"r"}=Apache2::RequestUtil->request(); + + tie *STDOUT,$W->{"r"}; + select *STDOUT; + $|=1; $W->{"QUERY_STRING"}=$W->{"r"}->args() || ""; - if ($W->{"QUERY_STRING"}=~/[&]amp;have_ent/) - { $W->{"have_ent"}=0; } - elsif ($W->{"QUERY_STRING"}=~ /[&]have_ent/) - { $W->{"have_ent"}=1; } - else - { delete $W->{"have_ent"}; } - if ($W->{"detect_ent"} && !defined $W->{"have_ent"} && $W->{"r"}->method() eq "GET") { - $W->{"head"}.='{"web_hostname_sub"}}()."/".($W->{"r"}->uri()=~m#^/*(.*)$#)[0] - ."?".($W->{"QUERY_STRING"} || "detect_ent_glue=1").'&have_ent=detect') - .'" />'."\n"; + if ($W->{"detect_ent"}) { + if ($W->{"QUERY_STRING"}=~/[&]amp;have_ent/) + { $W->{"have_ent"}=0; } + elsif ($W->{"QUERY_STRING"}=~ /[&]have_ent/) + { $W->{"have_ent"}=1; } + else + { delete $W->{"have_ent"}; } + if (!defined $W->{"have_ent"} && $W->{"r"}->method() eq "GET") { + $W->{"head"}.='{"web_hostname"}."/".($W->{"r"}->uri()=~m#^/*(.*)$#)[0] + ."?".($W->{"QUERY_STRING"} || "detect_ent_glue=1").'&have_ent=detect') + .'" />'."\n"; + } } $W->{"QUERY_STRING"}=~s/([&])amp;/$1/g; $W->{"r"}->args($W->{"QUERY_STRING"}); - $ENV{"QUERY_STRING"}=$W->{"QUERY_STRING"}; + # Workaround: &CGI::Vars behaves weird if strings passed both as POST data and in: $QUERY_STRING + do { $W->{"r"}->args(""); delete $ENV{"QUERY_STRING"}; } if $W->{"r"}->method() eq "POST"; # Do not: $W->{"r"}->args() # as it parses only QUERY_STRING (not POST data). - $W->{"args"}={ CGI->new()->Vars() }; - for (keys(%{$W->{"args"}})) { - my @vals=split /\x00/,$W->{"args"}{$_}; + $W->{"args"}={ CGI->new($W->{"r"})->Vars() }; + for my $name (keys(%{$W->{"args"}})) { + my @vals=split /\x00/,$W->{"args"}{$name}; next if @vals<=1; - $W->{"args"}{$_}=[@vals]; + $W->{"args"}{$name}=[@vals]; } - do { $W->{$_}=$ENV{"HTTP_ACCEPT"} if !defined $W->{$_}; } for ("accept"); - do { $W->{$_}=$ENV{"HTTP_USER_AGENT"} if !defined $W->{$_}; } for ("user_agent"); + do { $W->{$_}=$W->{"r"}->headers_in()->{"Accept"} if !defined $W->{$_}; } for ("accept"); + do { $W->{$_}=$W->{"r"}->headers_in()->{"User-Agent"} if !defined $W->{$_}; } for ("user_agent"); $W->{"browser"}=HTTP::BrowserDetect->new($W->{"user_agent"}); @@ -163,60 +213,140 @@ my($class,%args)=@_; $W->{"have_js"}=($W->{"args"}{"have_js"} ? 1 : 0); if ($W->{"detect_js"} && !$W->{"have_js"}) { - $W->{"head"}.=''."\n"; + $W->{"head"}.=''."\n"; } do { args_check(%$_) if $_; } for ($W->{"args_check"}); - return $W; + $ENV{"HOSTNAME"}||=$W->{"web_hostname"}; + + return bless $W,$class; +} + +# Although we have &tie-d *STDOUT we try to not to be dependent on it in My::Web itself. +sub Wprint($%) +{ +my($text,%args)=@_; + + cluck "undef Wprint" if !defined $text && !$args{"undef"}; + delete $args{"undef"}; + cluck join(" ","Invalid arguments:",keys(%args)) if keys(%args); + $W->{"r"}->puts($text) if defined $text; +} + +sub escapeHTML($) +{ +my($text)=@_; + + # Use &eval to prevent: Global $r object is not available. Set:\n\tPerlOptions +GlobalRequest\nin ... + # CGI requires valid "r": check it beforehand here. + confess "Calling dynamic URL generator from a static code" if !eval { Apache2::RequestUtil->request(); }; + return CGI::escapeHTML($text); } -sub top_dir_disk () +# local *FH; +# tie *FH,ref($W),$W; +sub TIEHANDLE($) { - do { return $_ if $_; } for ($W->{"top_dir"}); - return $INC[0]; # fallback +my($class,$W)=@_; + + my $self={}; + $self->{"W"}=$W or confess "Missing W"; + return bless $self,$class; +} + +sub WRITE +{ +my($self,$scalar,$length,$offset)=@_; + + Wprint substr($scalar,0,$length); +} + +# /home/user/www/webdir +sub dir_top_abs_disk() +{ + our $dir_top_abs_disk; + if (!$dir_top_abs_disk) { + my $selfpkg_relpath=__PACKAGE__; + $selfpkg_relpath=~s{::}{/}g; + $selfpkg_relpath.=".pm"; + my $selfpkg_abspath=$INC{$selfpkg_relpath} or do { + cluck "Unable to find self package $selfpkg_relpath"; + return; + }; + $selfpkg_abspath=~s{/*\Q$selfpkg_relpath\E$}{} or do { + cluck "Unable to strip myself \"$selfpkg_relpath\" from the abspath: $selfpkg_abspath"; + return; + }; + cluck "INC{myself} is relative?: $selfpkg_abspath" if $selfpkg_abspath!~m{^/}; + $dir_top_abs_disk=$selfpkg_abspath; + } + return $dir_top_abs_disk; +} + +sub unparsed_uri() +{ + if (!$W->{"unparsed_uri"}) { + # Do not: $W->{"r"} + # as we may be called before &init from: &My::Project::init + my $r=Apache2::RequestUtil->request(); + cluck "Calling ".'&unparsed_uri'." from a static code, going to fail" if !$r; + my $uri_string=$r->unparsed_uri() or cluck "Valid 'r' missing unparsed_uri()?"; + my $uri=URI->new_abs($uri_string,"http://".($W->{"web_hostname"}||$WebConfig{"web_hostname"})."/"); + $W->{"unparsed_uri"}=$uri; + } + return $W->{"unparsed_uri"}; } -sub top_dir (;$) +sub in_to_uri_abs($) { my($in)=@_; - if (my $uri=$ENV{"REQUEST_URI"}) { - if ($W->{"args"}{"Wabs"}) { - # FIXME: $in may not be defined here! - # to prevent: Use of uninitialized value in ... - if ($in=~m#^/#) { - $in=~s#^/*##; - } - else { - $in=$ENV{"REQUEST_URI"}."/".$in; - $in=~tr#/#/#s; - 1 while $in=~s#/(?:[^/]+)/\Q..\E/#/#g - } - return "http://".&{$W->{"web_hostname_sub"}}()."/".(defined $in ? $in : ""); - } - $uri.="Index" if $uri=~m#/$#; - if (defined $in) { - my($inpath,$inquery)=split /[?]/,$in,2; - $inpath=~tr///cs; - $uri=~tr///cs; - for (;;) { - my($in1 ,$in2 )=($in =~m#^(/[^/]+)(/.*)$#); - my($uri1,$uri2)=($uri=~m#^(/[^/]+)(/.*)$#); - last if !defined $in1 || !defined $uri1 || $in1 ne $uri1; - $in=$in2; - $uri=$uri2; - } - } - $uri=~s#^/*##; - $uri=~s#[^/]+#..#g; - $uri=File::Basename::dirname($uri); - my $r=$uri.(defined $in ? $in : ""); -# 1 while $r=~s#^[.]/##; -# $r="./$r" if $r=~m#^(?:?.*)$#; # empty pathname? - return $r; + # Otherwise we may have been already processed and thus legally relativized. + # FIXME data: Currently disabled, all the data are too violating such rule. + if (0 && !ref $in) { + my $uri_check=URI->new($in); + $uri_check->scheme() || $in=~m{^\Q./\E} || $in=~m{^/} + or cluck "Use './' or '/' prefix for all the local references: $in"; + } + my $uri=URI->new_abs($in,unparsed_uri()); + $uri=$uri->canonical(); + return $uri; +} + +# $args{"uri_as_in"}=1 to permit passing URI objects as: $in +sub path_web($%) +{ +my($in,%args)=@_; + + cluck if !$args{"uri_as_in"} && ref $in; + my $uri=in_to_uri_abs($in); + if (uri_is_local($uri)) { + # Prefer the $uri values over "args_persistent" values. + $uri->query_form_hash({ + map({ + my $key=$_; + my $val=$W->{"args"}{$key}; + (!defined $val ? () : ($key=>$val)); + } keys(%{$W->{"args_persistent"}})), + %{$uri->query_form_hash()}, + }); } - return top_dir_disk().$in; + return $uri->abs(unparsed_uri()) if $W->{"args"}{"Wabs"} || $args{"abs"}; + return $uri->rel(unparsed_uri()); +} + +# $args{"uri_as_in"}=1 to permit passing URI objects as: $in +sub path_abs_disk($%) +{ +my($in,%args)=@_; + + cluck if !$args{"uri_as_in"} && ref $in; + my $uri=in_to_uri_abs($in); + cluck if !uri_is_local($uri); + my $path=$uri->path(); + cluck "URI compatibility: ->path() not w/leading slash of URI \"$uri\"; path: $path" if $path!~m{^/}; + return dir_top_abs_disk().$path; } sub fatal (;$); @@ -226,16 +356,16 @@ sub args_check (%) my(%tmpl)=@_; while (my($name,$regex)=each(%tmpl)) { - my $name_html="Parameter ".CGI::escapeHTML($name).""; + my $name_html="Parameter ".escapeHTML($name).""; $W->{"args"}{$name}="" if !defined $W->{"args"}{$name}; $W->{"args"}{$name}=[ $W->{"args"}{$name} ] if !ref $W->{"args"}{$name} && ref $regex; fatal "$name_html passed as multivar although singlevar expected" if ref $W->{"args"}{$name} && !ref $regex; - $regex=${$regex}[0] if ref $regex; + $regex=$regex->[0] if ref $regex; for my $val (!ref $W->{"args"}{$name} ? $W->{"args"}{$name} : @{$W->{"args"}{$name}}) { $val="" if !defined $val; - fatal "$name_html ".CGI::escapeHTML($val)."" - ." does not match the required regex ".CGI::escapeHTML($regex)." " + fatal "$name_html ".escapeHTML($val)."" + ." does not match the required regex ".escapeHTML($regex)." " if $regex ne "" && $val!~/$regex/; } } @@ -253,10 +383,19 @@ sub fatal (;$) my($msg)=@_; $msg="UNKNOWN" if !$msg; - - $W->{"indexme"}=0; # For the case no heading was sent yet. - My::Web->heading(); - print "\n".vskip("3ex")."

FATAL ERROR: $msg!

\n" + cluck "FATAL: $msg"; + + # Do not send it unconditionally. + # The intial duplicated '{"heading_done"}=0 if $W->{"header_only"}; + # Do not send it unconditionally. + # Prevents warn: Headers already sent + if (!$W->{"heading_done"}) { + $W->{"indexme"}=0; # For the case no heading was sent yet. + $W->{"header_only"}=0; # assurance for &heading + My::Web->heading(); + } + Wprint "\n".vskip("3ex")."

FATAL ERROR: $msg!

\n" ."

You can report this problem's details to" ." ".a_href("mailto:".$W->{"admin_mail"},"admin of this website").".

\n"; footer(); @@ -266,31 +405,17 @@ sub footer (;$) { exit 1 if $W->{"footer_passed"}++; # deadlock prevention: - print vskip if $W->{"footer_delimit"}; + Wprint vskip if $W->{"footer_delimit"}; - if ($W->{"heading"}) { - do { &{$_}() if $_; } for ($W->{"footing_delimit"}); - } + Wprint $W->{"footing_delimit"},"undef"=>1; - print "
\n" if $W->{"footer"}; - - if ($W->{"footer_mailme"}) { - print '
'."\n"; - print '

'."\n"; - print ''."\n"; - print ''."\n"; - print ''."\n"; - print '

'."\n"; - print '
'."\n"; - } + Wprint "
\n" if $W->{"footer"}; + + my $packages_used=$W->{'packages_used@'}{$W->{"__PACKAGE__"}}; if ($W->{"footer_ids"}) { - print '

'; - print join("
\n",map({ my $package=$_; + Wprint '

'; + Wprint join("
\n",map({ my $package=$_; my $cvs_id=(eval('$'.$package."::CVS_ID") # || $package # debug ); @@ -304,49 +429,39 @@ sub footer (;$) my $file=$package; $file=~s#::#/#g; my $ext; - for (qw(.html.pl .pl .pm),"") { + my @tried; + for (qw(.pm)) { $ext=$_; - last if -r top_dir_disk()."/$file$ext"; - cluck "Class file $file not found" if !$ext; + my $path_abs_disk=path_abs_disk("/$file$ext"); + push @tried,$path_abs_disk; + last if -r $path_abs_disk; + cluck "Class file $file not found; tried: ".join(" ",@tried) if !$ext; } $file.=$ext; $cvs_id_split[2]="" .a_href((map({ my $s=$_; $s=~s#/viewcvs/#$&~checkout~/#; $s; } $W->{"viewcvs"}))[0]."$file?rev=".$cvs_id_split[2], $cvs_id_split[2]); - # FIXME: Use 'CVS/Repository' here. - my $viewcvs=$W->{"viewcvs"}; - $viewcvs=~s#(/viewcvs)/.*$#$1/MyWeb/# if $file=~s#^My/##; - $cvs_id_split[1]=a_href($viewcvs.$file, - ($package!~/^Apache::/ ? $package : $cvs_id_split[1])); - $cvs_id_split[5]=&{$W->{"cvs_id_author"}}($cvs_id_split[5]); + $cvs_id_split[1]=a_href($W->{"viewcvs"}.$file, + ($package!~/^Apache2::/ ? $package : $cvs_id_split[1])); + $cvs_id_split[5]=&{$W->{"cvs_id_author_sub"}}($cvs_id_split[5]); } join " ",@cvs_id_split; } - } ( - $W->{"__PACKAGE__"}, - __PACKAGE__, - @{$W->{"packages_used"}{$Apache::Registry::curstash}}, - ))); - print "

\n"; + } @$packages_used)); + Wprint "

\n"; } - for my $package ( - $W->{"__PACKAGE__"}, - __PACKAGE__, - @{$W->{"packages_used"}{$Apache::Registry::curstash}}, - ) { + for my $package (@$packages_used) { my $cvs_id=(eval('$'.$package."::CVS_ID") # || $package # debug ); - print ''."\n" if $cvs_id; + Wprint ''."\n" if $cvs_id; } - if ($W->{"heading"}) { - do { &{$_}() if $_; } for ($W->{"footing"}); - } + Wprint $W->{"footing"},"undef"=>1; - print "\n"; - exit(0); + Wprint "\n"; + exit 0; } sub header (%) @@ -377,68 +492,102 @@ my($size)=@_; return $size; } -sub url_is_local ($) +sub uri_is_local($) { -my($url)=@_; +my($in)=@_; - return $url!~m#^[a-z]+://#; + my $uri_rel=in_to_uri_abs($in)->rel(unparsed_uri()); + # Do not: defined $uri_rel->("userinfo"|"host"|"port")(); + # as they fail to be called for schemes not supporting them. + return 0 if $uri_rel->scheme(); + return 0 if $uri_rel->authority(); + return 1; } -sub a_href ($;$%) +# &path_web still may be required for &uri_escaped ! +sub uri_escaped($) { -my($url,$contents,%args)=@_; +my($uri)=@_; + + cluck if !ref $uri; + my $urient=escapeHTML($uri); + return $uri if $uri eq $urient; + return $urient if uri_is_local $uri; + return $uri if defined $W->{"have_ent"} && !$W->{"have_ent"}; # non-ent client + return $urient if $W->{"have_ent"}; # ent client + # Unknown client, &escapeHTML should not be needed here: + return escapeHTML(path_web('/Redirect.pm?location='.uri_escape($uri->abs(unparsed_uri())))); +} + +sub a_href($;$%) +{ +my($in,$contents,%args)=@_; do { $$_=1 if !defined $$_; } for (\$args{"size"}); if (!defined $contents) { - $contents=$url; + $contents=$in; $contents=File::Basename::basename($contents) if $args{"basename"}; - $contents=CGI::escapeHTML($contents); + $contents=escapeHTML($contents); } $contents=~s#]*>##gi; $contents=~s###gi; - $url=top_dir($url) if url_is_local $url && $url=~m#^/#; - - my $r='{"have_ent"}) # non-ent client - { $r.=$url; } - elsif ($W->{"have_ent"}) # ent client - { $r.=$urlent; } - else # unknown client, &CGI::escapeHTML should not be needed here - { $r.=CGI::escapeHTML(top_dir('/Redirect.pl?location='.uri_escape($url))); } + my $path_web=path_web $in,%args; + my $r=""; + $r.=''; - if ($args{"size"} && url_is_local($url) && ($args{"size"}>=2 || $url=~/[.](?:gz|Z|rpm|zip|deb|lha)/)) { # Downloadable? - $url=top_dir_disk().$url if $url=~m#^/#; - if (!-r $url) - { cluck "File not readable: $url"; } - else { - $r.=' ('.size_display((stat($url))[7]).')'; - } + if ($args{"size"} && uri_is_local($in) && ($args{"size"}>=2 || $in=~/[.](?:gz|Z|rpm|zip|deb|lha)/)) { # Downloadable? + my $path_abs_disk=path_abs_disk $in,%args; + cluck "File not readable: $path_abs_disk" if !-r $path_abs_disk; + $r.=' ('.size_display((stat($path_abs_disk))[7]).')'; } return $r; } +sub input_hidden_persistents() +{ + return join("",map({ + my $key=$_; + my $val=$W->{"args"}{$key}; + (!defined $val ? () : ''."\n"); + } (keys(%{$W->{"args_persistent"}})))); +} + +sub http_moved($$;$) +{ +my($self,$url,$status)=@_; + + $url=path_web($url,"abs"=>1); + $status||=HTTP_MOVED_TEMPORARILY; + $W->{"r"}->status($status); + $W->{"r"}->headers_out()->{"Location"}=$url; + $W->{"header_only"}=1; + My::Web->heading(); + exit; + die "NOTREACHED"; +} + sub remote_ip () { - # Do not: PerlModule Apache::ForwardedFor - # PerlPostReadRequestHandler Apache::ForwardedFor - # As 'Apache::ForwardedFor' takes the first of $ENV{"HTTP_X_FORWARDED_FOR"} + # Do not: PerlModule Apache2::ForwardedFor + # PerlPostReadRequestHandler Apache2::ForwardedFor + # As 'Apache2::ForwardedFor' takes the first of $ENV{"HTTP_X_FORWARDED_FOR"} # while the contents is '127.0.0.1, 213.220.195.171' if client has its own proxy. # We must take the last item ourselves. - my $r=$ENV{"HTTP_X_FORWARDED_FOR"} || $W->{"r"}->get_remote_host(); + my $r=$W->{"r"}->headers_in()->{"X-Forwarded-For"} || $W->{"r"}->get_remote_host(); $r=~s/^.*,\s*//; return $r; } sub is_cz () { + return 0 if !$have_Geo_IP; return "CZ" eq Geo::IP->new()->country_code_by_addr(remote_ip()); } @@ -454,13 +603,30 @@ sub make ($) { my($cmd)=@_; - system {'flock'} 'flock','-x',top_dir_disk(),$cmd.' >&2'; + # FIXME: &alarm, --timeout is now infinite. + # FIXME: Try to remove bash(1). + # FIXME: Use: @PATH_FLOCK@ + my @argv=('flock',dir_top_abs_disk(),'bash','-c',$cmd.' >&2'); + print STDERR join(" ","SPAWN:",@argv)."\n"; + system @argv; +} + +sub make_file($$) +{ +my($self,$file)=@_; + + cluck "Pathname not absolute: $file" if $file!~m{^/}; + return if -f $file; + # TODO: Somehow quickly check dependencies? + return make('make -s --no-print-directory' + .' -C '."'".File::Basename::dirname($file)."' '".File::Basename::basename($file)."'"); } sub img_size ($$) { my($width,$height)=@_; + cluck if !defined $width || !defined $height; return ($W->{"have_style"} ? "style=\"border:0;width:${width}px;height:${height}px\"" : "border=\"0\"") ." width=\"$width\" height=\"$height\""; } @@ -473,76 +639,78 @@ my(%args)=@_; return [ map(($args{$_}),@fields) ]; } +# Input: $self is required! +# Input: Put the fallback variant as the first one. +# Returns: always only scalar! +sub Negotiate_choose($$) +{ +my($self,$variants)=@_; + + my $best=HTTP::Negotiate::choose($variants, + # Do not: $W->{"r"} + # to prevent: Can't locate object method "scan" via package "Apache2::RequestRec" at HTTP/Negotiate.pm line 84. + # Do not: $W->{"r"}->headers_in() + # to prevent: Can't locate object method "scan" via package "APR::Table" at HTTP/Negotiate.pm line 84. + # Do not: HTTP::Headers->new($W->{"r"}->headers_in()); + # to prevent empty result or even: Odd number of elements in anonymous hash + HTTP::Headers->new(%{$W->{"r"}->headers_in()})); + $best||=$variants->[0]{"id"}; # &HTTP::Negotiate::choose failed? + return $best; +} + my @img_variants=( - { "id"=>"png","qs"=>1.0,"content-type"=>"image/png" }, - { "id"=>"gif","qs"=>0.9,"content-type"=>"image/gif" }, + { "id"=>"png","qs"=>0.9,"content-type"=>"image/png" }, + { "id"=>"gif","qs"=>0.7,"content-type"=>"image/gif" }, ); my $img_variants_re='[.](?:'.join('|',"jpeg",map(($_->{"id"}),@img_variants)).')$'; -sub img_src ($) +# Returns: ($path_web,$path_abs_disk) +# URI path segments support ignored here. Where it is used? (';' path segment options) +sub _img_src($%) { -my($file_base)=@_; +my($in,%args)=@_; - if (!url_is_local($file_base)) { - return $file_base if !wantarray(); - return ($file_base,$file_base); - } - # Known image extension? - if ($file_base=~m#$img_variants_re#o) { - return $file_base if !wantarray(); - return ($file_base,$file_base) if $file_base!~m#^/#; - return (top_dir($file_base),top_dir_disk().$file_base); - } + cluck if !uri_is_local $in; + my $uri=in_to_uri_abs $in; + my $path_abs_disk=path_abs_disk $uri,%args,"uri_as_in"=>1; - my $file_base_disk; - my $file_base_uri; - if ($file_base!~m#^/#) { - $file_base_disk=$file_base_uri=$file_base; - } - else { - $file_base_disk=top_dir_disk().$file_base; - $file_base_uri=top_dir($file_base); - } + # Known image extension? + return path_web($uri,%args,"uri_as_in"=>1),$path_abs_disk if $uri->path()=~m#$img_variants_re#o; my @nego_variants; for my $var (@img_variants) { - my $file=$file_base_disk.".".$var->{"id"}; - # TODO: Somehow quickly check dependencies? - make('make -s --no-print-directory' - .' -C '."'".File::Basename::dirname($file)."' '".File::Basename::basename($file)."'") - if !-f $file; + my $path_abs_disk_variant=$path_abs_disk.".".$var->{"id"}; + __PACKAGE__->make_file($path_abs_disk_variant); push @nego_variants,negotiate_variant( %$var, - "size"=>(stat $file)[7], + "size"=>(stat $path_abs_disk_variant)[7], ); } - # Do not: ,$W->{"r"}); - # but should we provide somehow either 'HTTP::Headers' or 'HTTP::Request' ? - my $ext=HTTP::Negotiate::choose(\@nego_variants); - $ext||=$img_variants[0]->{"id"}; # &HTTP::Negotiate::choose failed? + my $ext=__PACKAGE__->Negotiate_choose(\@nego_variants); - return $file_base_uri.".".$ext if !wantarray(); - return ($file_base_uri.".".$ext,$file_base_disk.".".$ext); + $uri->path($uri->path().".$ext"); + return path_web($uri,%args,"uri_as_in"=>1),path_abs_disk($uri,%args,"uri_as_in"=>1); } -sub img ($$;%) +# $args{"attr"} +sub img ($$%) { -my($file_base,$alt,%attr)=@_; +my($in,$alt,%args)=@_; - my($file_uri,$file_disk)=img_src $file_base; - my($width,$height)=Image::Size::imgsize($file_disk); + my($path_web,$path_abs_disk)=_img_src($in,%args); + my($width,$height)=Image::Size::imgsize($path_abs_disk); $alt=~s/<[^>]*>//g; - $alt=CGI::escapeHTML($alt); - my $content="\"$alt\""; - return a_href img_src($attr{"a_href_img"}),$content if $attr{"a_href_img"}; - return a_href $attr{"a_href"},$content if $attr{"a_href"}; + $alt=escapeHTML($alt); + my $content="\"$alt\""; + do { return a_href((_img_src($_))[0],$content,"uri_as_in"=>1) if $_; } for $args{"a_href_img"}; + do { return a_href $_,$content if $_; } for $args{"a_href"}; return $content; } sub centerimg { - my $r.=""; + my $r=""; $r.=''."\n"; @_=( [@_] ) if !ref $_[0]; for (@_) { @@ -556,11 +724,12 @@ sub rightimg { my($text,@args_img)=@_; - # Workaround bug of 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)': + # FIXME: Workaround bug of 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)': + # ie() ? "1*" : "90%" ) ]}" /> + # ie() ? "0*" : "10%" ) ]}" /> + # causes whole invisible projects in: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7.10) Gecko/20050719 Galeon/1.3.21 return <<"HERE";
- ie() ? "1*" : "90%" ) ]}" /> - ie() ? "0*" : "10%" ) ]}" />
@{[ $text ]} @@ -573,100 +742,109 @@ my($text,@args_img)=@_; HERE } -sub readfile ($$) +sub readfile($$) { my($class,$filename)=@_; local *F; - open F,$filename or die "Cannot open \"$filename\": $!"; - local $/=undef(); - my $data=; - close F; - return $data; + open F,$filename or cluck "Cannot open \"$filename\": $!"; + my $F=do { local $/=undef(); ; }; + close F or cluck "Cannot close \"$filename\": $!"; + return $F; } -sub arr_keys (@) +sub no_cache($) { -my(@arr)=@_; +my($self)=@_; - my @r=(); - while (@arr) { - push @r,shift @arr; # key - shift @arr; # val - } - return @r; + header("Expires"=>"Mon, 26 Jul 1997 05:00:00 GMT"); # date in the past + header("Last-Modified"=>strftime("%a, %d %b %Y %H:%M:%S GMT",gmtime())); # always modified + header("Cache-Control"=>"no-cache, must-revalidate"); # HTTP/1.1 + header("Pragma"=>"no-cache"); # HTTP/1.0 } -sub heading () +sub heading() { my($class)=@_; - return if $W->{"heading_passed"}++; - # $ENV{"CLIENT_CHARSET"} ignored (mod_czech support dropped!) my $client_charset=$W->{"force_charset"} || "us-ascii"; header("Content-Style-Type"=>"text/css"); header("Content-Script-Type"=>"text/javascript"); + do { header("Content-Language"=>$_) if $_; } for $W->{"language"}; + $class->no_cache() if $W->{"no_cache"}; while (my($key,$val)=each(%{$W->{"headers"}})) { - $W->{"r"}->header_out($key,$val); + $W->{"r"}->headers_out()->{$key}=$val; } - $W->{"r"}->send_http_header("text/html; charset=$client_charset"); # "Content-type"; do not use header() - - return if $W->{"heading_done"}++; exit if $W->{"r"}->header_only(); + return if $W->{"header_only"}; + # We still can append headers before we put out some text. + # FIXME: It is not clean to still append them without overwriting. + return if $W->{"heading_done"}++; - if (1) { # || !$msie_major || $msie_major>=4) # TODO:dyn - print ''."\n"; + my $lang=($W->{"language"}||"en-US"); + # Workaround bug + # https://bugzilla.mozilla.org/show_bug.cgi?id=120556 + # of at least + # Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8b) Gecko/20050217 + my $mime=$class->Negotiate_choose([ + # Put the fallback variant as the first one. + # Rate both variants the same to prefer "text/html" for undecided clients. + # At least + # Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8b) Gecko/20050217 + # prefers "application/xhtml+xml" over "text/html" itself: + # text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5 + negotiate_variant( + "id"=>"text/html", + "content-type"=>"text/html", + "qs"=>0.6, + "charset"=>$client_charset, + "lang"=>$lang, + ), + negotiate_variant( + "id"=>"application/xhtml+xml", + "content-type"=>"application/xhtml+xml", + "qs"=>0.6, + "charset"=>$client_charset, + "lang"=>$lang, + ), + # application/xml ? + # text/xml ? + ]); + $W->{"r"}->content_type("$mime; charset=$client_charset"); + if (1) { # (|| !$msie_major || $msie_major>=4) # TODO:dyn + Wprint ''."\n"; } - print ''."\n"; - print ''."\n"; + Wprint ''."\n"; + Wprint ''."\n"; my $title=$W->{"title_prefix"}.join("",map({ ': '.$_; } ($W->{"title"} || ()))); $title=~s#<[^>]*>##g; - print ""; - print "$title\n"; - + Wprint ""; + Wprint "$title\n"; if ($W->{"have_css"}) { - print <<'HERE'; -\n"; } - - print ''."\n"; - print $W->{"head"}; + Wprint ''."\n"; + Wprint $W->{"head"}; for my $type (qw(prev next index contents start up)) { - do { print ''."\n" if $_; } for ($W->{"rel_$type"}); + do { Wprint ''."\n" if $_; } + for ($W->{"rel_$type"}); } - print "{"browser"}->netscape() && (!$W->{"browser"}->major() || $W->{"browser"}->major()<=4); - print ">\n"; + Wprint $W->{"body_attr"}; + Wprint ">\n"; - if ($W->{"heading"}) { - do { &{$_}() if $_; } for ($W->{"heading"}); - } + Wprint $W->{"heading"},"undef"=>1; } +BEGIN { + delete $W->{"__My::Web_init"}; + } + 1;