update for rename of recentchanges.mdwn to __8226____9__Get_CAll___64___1__42__855...

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

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index f448db6ef8a213fa84d57f72ad236569c510d304..243662386a55f84fc21c6959e136b4de3eaec27c 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -67,9 +67,6 @@ sub cgitemplate ($$$;@) {
        if (exists $params{page}) {
                $page=delete $params{page};
                $params{forcebaseurl}=urlto($page);
        if (exists $params{page}) {
                $page=delete $params{page};
                $params{forcebaseurl}=urlto($page);

-               if (! $config{html5}) {
-                       $params{forcebaseurl}=urlabs($params{forcebaseurl}, $topurl);
-               }

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


@@ -81,9 +78,6 @@ sub cgitemplate ($$$;@) {
        templateactions($template, "");
 
        my $baseurl = baseurl();
        templateactions($template, "");
 
        my $baseurl = baseurl();

-       if (! $config{html5}) {
-               $baseurl = urlabs($baseurl, $topurl),
-       }

 
        $template->param(
                dynamic => 1,
 
        $template->param(
                dynamic => 1,


@@ -130,9 +124,7 @@ sub decode_cgi_utf8 ($) {
 
 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 {


@@ -344,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;
                }


@@ -421,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);


@@ -491,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>");