]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - IkiWiki/CGI.pm
In rebuilds, assume that every page has been scanned by the time the scan phase ends
[git.ikiwiki.info.git] / IkiWiki / CGI.pm
index d801c72a00c1be4d2a8bae752822de91b3c1e69f..1763828a4eef973fce3296e2ffdd452f22e0a058 100644 (file)
@@ -336,16 +336,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;
                }