X-Git-Url: https://git.jankratochvil.net/?a=blobdiff_plain;f=Web.pm;h=e41a314f3d09e47f2d524abca9ba690d5df97d32;hb=refs%2Fheads%2Fmodperl;hp=2b89eefd75bb819df33d3ee695aa05defeccc0a6;hpb=279b8f9798fd00c4743ba37148d75ec14510ee4a;p=MyWeb.git

diff --git a/Web.pm b/Web.pm
index 2b89eef..e41a314 100644
--- a/Web.pm
+++ b/Web.pm
@@ -134,7 +134,7 @@ my($class,%args)=@_;
 		{ 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->{"r"}->hostname()."/".($W->{"r"}->uri()=~m#^/*(.*)$#)[0]
+				.CGI::escapeHTML("http://".&{$W->{"web_hostname_sub"}}()."/".($W->{"r"}->uri()=~m#^/*(.*)$#)[0]
 						."?".($W->{"QUERY_STRING"} || "detect_ent_glue=1").'&have_ent=detect')
 				.'" />'."\n";
 		}
@@ -142,8 +142,13 @@ my($class,%args)=@_;
 	$W->{"r"}->args($W->{"QUERY_STRING"});
 	$ENV{"QUERY_STRING"}=$W->{"QUERY_STRING"};
 	# Do not: $W->{"r"}->args()
-	# as it  parses only QUERY_STRING (not POST data).
+	# as it parses only QUERY_STRING (not POST data).
 	$W->{"args"}={ CGI->new()->Vars() };
+	for (keys(%{$W->{"args"}})) {
+		my @vals=split /\x00/,$W->{"args"}{$_};
+		next if @vals<=1;
+		$W->{"args"}{$_}=[@vals];
+		}
 
 	do { $W->{$_}=$ENV{"HTTP_ACCEPT"} if !defined $W->{$_}; } for ("accept");
 	do { $W->{$_}=$ENV{"HTTP_USER_AGENT"} if !defined $W->{$_}; } for ("user_agent");
@@ -208,11 +213,16 @@ my(%tmpl)=@_;
 	while (my($name,$regex)=each(%tmpl)) {
 		my $name_html="Parameter <span class=\"quote\">".CGI::escapeHTML($name)."</span>";
 		$W->{"args"}{$name}="" if !defined $W->{"args"}{$name};
-		my $val=$W->{"args"}{$name};
-		$val="" if !defined $val;
-		fatal "$name_html <span class=\"quote\">".CGI::escapeHTML($val)."</span>"
-						." does not match required regex <span class=\"quote\">".CGI::escapeHTML($regex)."</span> "
-				if $regex ne "" && $val!~/$regex/;
+		$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;
+		for my $val (!ref $W->{"args"}{$name} ? $W->{"args"}{$name} : @{$W->{"args"}{$name}}) {
+			$val="" if !defined $val;
+			fatal "$name_html <span class=\"quote\">".CGI::escapeHTML($val)."</span>"
+							." does not match the required regex <span class=\"quote\">".CGI::escapeHTML($regex)."</span> "
+					if $regex ne "" && $val!~/$regex/;
+			}
 		}
 }
 
@@ -229,7 +239,8 @@ my($msg)=@_;
 
 	$msg="UNKNOWN" if !$msg;
 
-#	heading(false/*title*/,false/*indexme*/);	# notitle is always safe, don't index the error message
+	$W->{"indexme"}=0;	# For the case no heading was sent yet.
+	My::Web->heading();
 	print "\n".vskip("3ex")."<hr /><h1 class=\"error\">FATAL ERROR: $msg!</h1>\n"
 			."<p>You can report this problem's details to"
 			." ".a_href("mailto:".$W->{"admin_mail"},"admin of this website").".</p>\n";
@@ -242,6 +253,10 @@ sub footer (;$)
 
 	print vskip if $W->{"footer_delimit"};
 
+	if ($W->{"heading"}) {
+		do { &{$_}() if $_; } for ($W->{"footing_delimit"});
+		}
+
 	print "<hr />\n" if $W->{"footer"};
 
 	if ($W->{"footer_mailme"}) {
@@ -564,6 +579,8 @@ 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");