X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9d928bd69496648cd7a2d4542a2d533992c01757..f282512da75d19e38933f3083afa3c2a9dad463c:/IkiWiki/CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index cb83319e6..a6c0c2712 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -58,12 +58,18 @@ sub cgitemplate ($$$;@) {
 	
 	my $template=template("page.tmpl");
 
-	my $topurl = defined $cgi ? $cgi->url : $config{url};
+	my $topurl = $config{url};
+	if (defined $cgi && ! $config{w3mmode} && ! $config{reverse_proxy}) {
+		$topurl = $cgi->url;
+	}
 
 	my $page="";
 	if (exists $params{page}) {
 		$page=delete $params{page};
-		$params{forcebaseurl}=urlabs(urlto($page), $topurl);
+		$params{forcebaseurl}=urlto($page);
+		if (! $config{html5}) {
+			$params{forcebaseurl}=urlabs($params{forcebaseurl}, $topurl);
+		}
 	}
 	run_hooks(pagetemplate => sub {
 		shift->(
@@ -74,12 +80,17 @@ sub cgitemplate ($$$;@) {
 	});
 	templateactions($template, "");
 
+	my $baseurl = baseurl();
+	if (! $config{html5}) {
+		$baseurl = urlabs($baseurl, $topurl),
+	}
+
 	$template->param(
 		dynamic => 1,
 		title => $title,
 		wikiname => $config{wikiname},
 		content => $content,
-		baseurl => urlabs(baseurl(), $topurl),
+		baseurl => $baseurl,
 		html5 => $config{html5},
 		%params,
 	);
@@ -90,7 +101,13 @@ sub cgitemplate ($$$;@) {
 sub redirect ($$) {
 	my $q=shift;
 	eval q{use URI};
-	my $url=URI->new(urlabs(shift, $q->url));
+
+	my $topurl;
+	if (defined $q && ! $config{w3mmode} && ! $config{reverse_proxy}) {
+		$topurl = $q->url;
+	}
+
+	my $url=URI->new(urlabs(shift, $topurl));
 	if (! $config{w3mmode}) {
 		print $q->redirect($url);
 	}
@@ -105,7 +122,8 @@ sub decode_cgi_utf8 ($) {
 	if ($] < 5.01) {
 		my $cgi = shift;
 		foreach my $f ($cgi->param) {
-			$cgi->param($f, map { decode_utf8 $_ } $cgi->param($f));
+			$cgi->param($f, map { decode_utf8 $_ }
+				@{$cgi->param_fetch($f)});
 		}
 	}
 }
@@ -473,6 +491,9 @@ sub cgi (;$$) {
 sub cgierror ($) {
 	my $message=shift;
 
+	eval q{use HTML::Entities};
+	$message = encode_entities($message);
+
 	print "Content-type: text/html\n\n";
 	print cgitemplate(undef, gettext("Error"),
 		"<p class=\"error\">".gettext("Error").": $message</p>");