X-Git-Url: http://git.jankratochvil.net/?p=MyWeb.git;a=blobdiff_plain;f=Web.pm;h=456e7c8bcfd721d12166e2aa86d985469d83e829;hp=2dd77470bc95eec121632e68e7df4aca3c1db4c4;hb=1ee642491d049abd3ee7324f395940f1650436bf;hpb=04cfa87afa399b81e737964810304fa942b0eca7

diff --git a/Web.pm b/Web.pm
index 2dd7747..456e7c8 100644
--- a/Web.pm
+++ b/Web.pm
@@ -27,8 +27,8 @@ use Exporter;
 sub Wrequire ($);
 sub Wuse ($@);
 our $W;
-our @EXPORT=qw(&Wrequire &Wuse &a_href &a_href_cz &vskip &img &centerimg &rightimg $W &top_dir &top_dir_disk &Wprint);
-our @ISA=qw(Exporter);
+our @EXPORT=qw(&Wrequire &Wuse &a_href &a_href_cz &vskip &img &centerimg &rightimg $W &top_dir &top_dir_disk &Wprint &input_hidden_persistents);
+our @ISA=qw(Exporter Tie::Handle);
 
 BEGIN
 {
@@ -46,9 +46,11 @@ BEGIN
 		$file.=".pm";
 		my $who=$W->{"__PACKAGE__"};
 		$who||="__My::Web" if $W->{"__My::Web_init"};
-		my $aref=($W->{"packages_used"}{$who}||=[]);
-		push @$aref,$class
-				if !{ map(($_=>1),@$aref) }->{$class};	# Prevent duplicated entries.
+		if ($who) {
+			my $aref=($W->{"packages_used"}{$who}||=[]);
+			push @$aref,$class
+					if !{ map(($_=>1),@$aref) }->{$class};	# Prevent duplicated entries.
+			}
 		CORE::require $file;
 		1;	# Otherwise 'require' would already file above.
 	}
@@ -76,12 +78,15 @@ require HTTP::Negotiate;
 my $have_Geo_IP; BEGIN { $have_Geo_IP=eval { require Geo::IP; 1; }; }
 use ModPerl::Util qw(exit);
 use POSIX qw(strftime);
+use Tie::Handle;
+use Apache::Const qw(HTTP_MOVED_TEMPORARILY);
+use URI;
+use URI::QueryParam;
 
 
 #our $W;
 		# $W->{"title"}
 		# $W->{"head"}
-		# $W->{"head_css"}
 		# $W->{"force_charset"}
 		# $W->{"heading_done"}
 		# $W->{"footer_passed"}
@@ -110,14 +115,14 @@ my($class,%args)=@_;
 	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)) {
@@ -130,27 +135,31 @@ my($class,%args)=@_;
 	$W->{"r"}=Apache->request();
 
 	$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"}.='<meta http-equiv="Refresh" content="0; URL='
-				.CGI::escapeHTML("http://".&{$W->{"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"}.='<meta http-equiv="Refresh" content="0; URL='
+					.CGI::escapeHTML("http://".&{$W->{"web_hostname_sub"}}()."/".($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"});
+	# 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($W->{"r"})->Vars() };
-	for (keys(%{$W->{"args"}})) {
-		my @vals=split /\x00/,$W->{"args"}{$_};
+	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->{$_}=$W->{"r"}->headers_in()->{"Accept"}     if !defined $W->{$_}; } for ("accept");
@@ -171,14 +180,32 @@ my($class,%args)=@_;
 
 	$ENV{"HOSTNAME"}||=&{$W->{"web_hostname_sub"}}();
 
-	return $W;
+	return bless $W,$class;
 }
 
 sub Wprint($)
 {
 my($text)=@_;
 
-	$W->{"r"}->print($text);
+	$W->{"r"}->puts($text);
+}
+
+# local *FH;
+# tie *FH,ref($W),$W;
+sub TIEHANDLE($)
+{
+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);
 }
 
 sub top_dir_disk ()
@@ -187,12 +214,13 @@ sub top_dir_disk ()
 	return $INC[0];	# fallback
 }
 
-sub top_dir (;$)
+# $args{"abs"}
+sub top_dir (;$%)
 {
-my($in)=@_;
+my($in,%args)=@_;
 
 	if (my $uri=$W->{"r"}->unparsed_uri()) {
-		if ($W->{"args"}{"Wabs"}) {
+		if ($W->{"args"}{"Wabs"} || $args{"abs"}) {
 			# FIXME: $in may not be defined here!
 			# to prevent: Use of uninitialized value in ...
 			if ($in=~m#^/#) {
@@ -263,8 +291,11 @@ sub fatal (;$)
 my($msg)=@_;
 
 	$msg="UNKNOWN" if !$msg;
+	cluck "FATAL: $msg";
 
 	$W->{"indexme"}=0;	# For the case no heading was sent yet.
+	$W->{"heading_done"}=0;	# for the case of already sent {"header_only"}==1
+	$W->{"header_only"}=0;	# assurance for &heading
 	My::Web->heading();
 	Wprint "\n".vskip("3ex")."<hr /><h1 class=\"error\">FATAL ERROR: $msg!</h1>\n"
 			."<p>You can report this problem's details to"
@@ -278,9 +309,7 @@ sub footer (;$)
 
 	Wprint vskip if $W->{"footer_delimit"};
 
-	if ($W->{"heading"}) {
-		do { &{$_}() if $_; } for ($W->{"footing_delimit"});
-		}
+	do { &{$_}() if $_; } for ($W->{"footing_delimit"});
 
 	Wprint "<hr />\n" if $W->{"footer"};
 
@@ -290,6 +319,7 @@ sub footer (;$)
 				."this.elements['msghtml'].value='';"
 				."this.submit();"
 				.'">'."\n";
+			Wprint input_hidden_persistents()."\n";
 			Wprint '<p align="right">'."\n";
 				Wprint '<input name="msgscript" type="hidden" />'."\n";
 				Wprint '<input name="msghtml" type="text" size="32" alt="Message" />'."\n";
@@ -351,9 +381,7 @@ sub footer (;$)
 		Wprint '<!-- '.$package.' - $'.$cvs_id.'$ -->'."\n" if $cvs_id;
 		}
 
-	if ($W->{"heading"}) {
-		do { &{$_}() if $_; } for ($W->{"footing"});
-		}
+	do { &{$_}() if $_; } for ($W->{"footing"});
 
 	Wprint "</body></html>\n";
 	exit(0);
@@ -394,6 +422,28 @@ my($url)=@_;
 	return $url!~m#^[a-z]+://#;
 }
 
+sub url_out($%)
+{
+my($url,%args)=@_;
+
+	return $url if !url_is_local $url;
+	$url=top_dir($url,%args) if $url=~m#^/# || $args{"abs"};
+
+	my $uri=URI->new($url);
+	# 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()},
+			});
+	$url="".$uri;
+
+	return $url;
+}
+
 sub a_href ($;$%)
 {
 my($url,$contents,%args)=@_;
@@ -407,7 +457,7 @@ my($url,$contents,%args)=@_;
 	$contents=~s#<a\b[^>]*>##gi;
 	$contents=~s#</a>##gi;
 
-	$url=top_dir($url) if url_is_local $url && $url=~m#^/#;
+	$url=url_out($url,%args);
 
 	my $r='<a href="';
 	my $urlent=CGI::escapeHTML($url);
@@ -435,6 +485,32 @@ my($url,$contents,%args)=@_;
 	return $r;
 }
 
+sub input_hidden_persistents()
+{
+	return join("",map({
+		my $key=$_;
+		my $val=$W->{"args"}{$key};
+		(!defined $val ? () : '<input type="hidden"'
+				.' name="'.CGI::escapeHTML($key).'"'
+				.' value="'.CGI::escapeHTML($val).'"'
+				.' />'."\n");
+		} (keys(%{$W->{"args_persistent"}}))));
+}
+
+sub http_moved($$;$)
+{
+my($self,$url,$status)=@_;
+
+	$url=url_out($url,"abs"=>1);
+	$status||=Apache::HTTP_MOVED_TEMPORARILY;
+	$W->{"r"}->status($status);
+	$W->{"r"}->header_out("Location"=>$url);
+	$W->{"header_only"}=1;
+	My::Web->heading();
+	exit;
+	die "NOTREACHED";
+}
+
 sub remote_ip ()
 {
 	# Do not: PerlModule                 Apache::ForwardedFor
@@ -484,9 +560,28 @@ 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 "Apache::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)).')$';
 
@@ -527,10 +622,7 @@ my($file_base)=@_;
 				"size"=>(stat $file)[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);
@@ -622,60 +714,67 @@ 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"}->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"}++;
 
+	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"}->send_http_header("$mime; charset=$client_charset");	# "Content-type"; do not use header()
 	if (1) { # || !$msie_major || $msie_major>=4) # TODO:dyn
 		Wprint '<?xml version="1.0" encoding="'.$client_charset.'"?>'."\n";
 		}
 	Wprint '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">'."\n";
-	Wprint '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">'."\n";
+	Wprint '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="'.$lang.'">'."\n";
 	my $title=$W->{"title_prefix"}.join("",map({ ': '.$_; } ($W->{"title"} || ())));
 	$title=~s#<[^>]*>##g;
 	Wprint "<head>";
 	Wprint "<title>$title</title>\n";
-
 	if ($W->{"have_css"}) {
-		Wprint <<'HERE';
-<style type="text/css"><!--
-.cvs-id   { font-family: monospace; }
-.error    { color: red;   background-color: transparent; }
-.quote    { font-family: monospace; }
-.nowrap   { white-space: nowrap; }
-.centered { text-align: center; }
-.tab-bold { font-weight: bold; }
-.tab-head { font-weight: bold; }
-/*
-.tab-head { font-weight: bold; color: yellow; background-color: transparent; }
-body {
-		background-color: black;
-		color: white;
-		}
-:link    { color: aqua;   background-color: transparent; }
-:visited { color: teal;   background-color: transparent; }
-h1,h2    { color: yellow; background-color: transparent; }
-*/
-td       { padding: 2px; }
-caption  { caption-side: bottom; }
-.footer img { vertical-align: middle; }
+		# Everything can get overriden later.
+		Wprint <<"HERE";
+<link rel="stylesheet" type="text/css" href="@{[ url_out("/My/Web.css") ]}" />
 HERE
-		Wprint $W->{"head_css"}."\n";
-		Wprint "--></style>\n";
 		}
-
 	Wprint '<meta name="robots" content="'.($W->{"indexme"} ? "" : "no" ).'index,follow" />'."\n";
 	Wprint $W->{"head"};
 	for my $type (qw(prev next index contents start up)) {
@@ -684,12 +783,10 @@ HERE
 	Wprint "</head><body";
 #	Wprint ' bgcolor="black" text="white" link="aqua" vlink="teal"'
 #			if $W->{"browser"}->netscape() && (!$W->{"browser"}->major() || $W->{"browser"}->major()<=4);
-	do { &{$_}($W) if $_; } for $W->{"body_attr_sub"};
+	Wprint $W->{"body_attr"};
 	Wprint ">\n";
 
-	if ($W->{"heading"}) {
-		do { &{$_}() if $_; } for ($W->{"heading"});
-		}
+	do { &{$_}() if $_; } for ($W->{"heading"});
 }
 
 BEGIN {