openid spam happens, as it turns out

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index bb36b0885e8c43ff0b913c850935d18d7cf81529..8244fa99607aaf42d5dae9c76d7fe76db6018ab7 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1217,7 +1217,7 @@ sub cgiurl (@) {
        }
 
        return $cgiurl."?".
-               join("&", map $_."=".uri_escape_utf8($params{$_}), keys %params);
+               join("&", map $_."=".uri_escape_utf8($params{$_}), sort(keys %params));
 }
 
 sub cgiurl_abs (@) {
@@ -1471,7 +1471,9 @@ sub emailuser ($) {
        if (defined $user && $user =~ m/(.+)@/) {
                my $nick=$1;
                # remove any characters from not allowed in wiki files
-               $nick=~s/[^$config{wiki_file_chars}]/_/g;
+               # support use w/o %config set
+               my $chars = defined $config{wiki_file_chars} ? $config{wiki_file_chars} : "-[:alnum:]+/.:_";
+               $nick=~s/[^$chars]/_/g;
                return $nick;
        }
        return;