Merge branch 'master' into debian-jessie-backports

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

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index d801c72a00c1be4d2a8bae752822de91b3c1e69f..89f4f2d732715aa3465ca9b7d181409c469e6d75 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -58,11 +58,6 @@ sub cgitemplate ($$$;@) {
        
        my $template=template("page.tmpl");
 
-       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};
@@ -336,16 +331,19 @@ sub check_banned ($$) {
 
        my $banned=0;
        my $name=$session->param("name");
+       my $cloak=cloak($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(),
-                       name => defined $name ? $name : "",
-               )) {
+                       name => defined $name ? $name : "")
+                  || pagespec_match("", $b,
+                       ip => cloak($session->remote_addr()),
+                       name => defined $cloak ? $cloak : "")) {
                        $banned=1;
                        last;
                }
@@ -413,7 +411,9 @@ sub cgi (;$$) {
 
        eval q{use CGI};
        error($@) if $@;
+       no warnings "once";
        $CGI::DISABLE_UPLOADS=$config{cgi_disable_uploads};
+       use warnings;
 
        if (! $q) {
                binmode(STDIN);
@@ -483,6 +483,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>");