(no commit message)

[git.ikiwiki.info.git] / IkiWiki / CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index cb83319e62ee893d92fd1d5f64695c23144d2614..243662386a55f84fc21c6959e136b4de3eaec27c 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -58,12 +58,15 @@ sub cgitemplate ($$$;@) {
        
        my $template=template("page.tmpl");
 
        
        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};
 
        my $page="";
        if (exists $params{page}) {
                $page=delete $params{page};

-               $params{forcebaseurl}=urlabs(urlto($page), $topurl);
+               $params{forcebaseurl}=urlto($page);

        }
        run_hooks(pagetemplate => sub {
                shift->(
        }
        run_hooks(pagetemplate => sub {
                shift->(


@@ -74,12 +77,14 @@ sub cgitemplate ($$$;@) {
        });
        templateactions($template, "");
 
        });
        templateactions($template, "");
 

+       my $baseurl = baseurl();
+

        $template->param(
                dynamic => 1,
                title => $title,
                wikiname => $config{wikiname},
                content => $content,
        $template->param(
                dynamic => 1,
                title => $title,
                wikiname => $config{wikiname},
                content => $content,

-               baseurl => urlabs(baseurl(), $topurl),
+               baseurl => $baseurl,

                html5 => $config{html5},
                %params,
        );
                html5 => $config{html5},
                %params,
        );


@@ -90,7 +95,13 @@ sub cgitemplate ($$$;@) {
 sub redirect ($$) {
        my $q=shift;
        eval q{use URI};
 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);
        }
        if (! $config{w3mmode}) {
                print $q->redirect($url);
        }


@@ -105,16 +116,15 @@ sub decode_cgi_utf8 ($) {
        if ($] < 5.01) {
                my $cgi = shift;
                foreach my $f ($cgi->param) {
        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)});

                }
        }
 }
 
 sub safe_decode_utf8 ($) {
     my $octets = shift;
                }
        }
 }
 
 sub safe_decode_utf8 ($) {
     my $octets = shift;

-    # call decode_utf8 on >= 5.20 only if it's not already decoded,
-    # otherwise it balks, on < 5.20, always call it
-    if ($] < 5.02 || !Encode::is_utf8($octets)) {
+    if (!Encode::is_utf8($octets)) {

         return decode_utf8($octets);
     }
     else {
         return decode_utf8($octets);
     }
     else {


@@ -326,16 +336,19 @@ sub check_banned ($$) {
 
        my $banned=0;
        my $name=$session->param("name");
 
        my $banned=0;
        my $name=$session->param("name");

+       my $cloak=cloak($name) if defined $name;

        if (defined $name && 
        if (defined $name && 

-           grep { $name eq $_ } @{$config{banned_users}}) {
+           grep { $name eq $_ || $cloak eq $_ } @{$config{banned_users}}) {

                $banned=1;
        }
 
        foreach my $b (@{$config{banned_users}}) {
                if (pagespec_match("", $b,
                        ip => $session->remote_addr(),
                $banned=1;
        }
 
        foreach my $b (@{$config{banned_users}}) {
                if (pagespec_match("", $b,
                        ip => $session->remote_addr(),

-                       name => defined $name ? $name : "",
-               )) {
+                       name => defined $name ? $name : "")
+                  || pagespec_match("", $b,
+                       ip => cloak($session->remote_addr()),
+                       name => defined $cloak ? $cloak : "")) {

                        $banned=1;
                        last;
                }
                        $banned=1;
                        last;
                }


@@ -403,7 +416,9 @@ sub cgi (;$$) {
 
        eval q{use CGI};
        error($@) if $@;
 
        eval q{use CGI};
        error($@) if $@;

+       no warnings "once";

        $CGI::DISABLE_UPLOADS=$config{cgi_disable_uploads};
        $CGI::DISABLE_UPLOADS=$config{cgi_disable_uploads};

+       use warnings;

 
        if (! $q) {
                binmode(STDIN);
 
        if (! $q) {
                binmode(STDIN);


@@ -473,6 +488,9 @@ sub cgi (;$$) {
 sub cgierror ($) {
        my $message=shift;
 
 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>");
        print "Content-type: text/html\n\n";
        print cgitemplate(undef, gettext("Error"),
                "<p class=\"error\">".gettext("Error").": $message</p>");