Add reverse_proxy option which hard-codes cgiurl in CGI output

[ikiwiki.git] / IkiWiki / CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index cb83319e62ee893d92fd1d5f64695c23144d2614..70e3b713473c789e3c844b6dd853b608d8f94709 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -58,7 +58,10 @@ 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}) {
@@ -90,7 +93,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);
        }