Merge branch 'master' into debian-jessie-backports

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 53eb8235bf85a6f7a419cec8206c397da10fdf06..fa71f479107a2388fde2fe00a67bfa2daa4fb3a9 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -165,7 +165,7 @@ sub getsetup () {
        default_plugins => {
                type => "internal",
                default => [qw{mdwn link inline meta htmlscrubber passwordauth
        default_plugins => {
                type => "internal",
                default => [qw{mdwn link inline meta htmlscrubber passwordauth

-                               openid emailauth signinedit lockedit conditional
+                               openid signinedit lockedit conditional

                                recentchanges parentlinks editpage
                                templatebody}],
                description => "plugins to enable by default",
                                recentchanges parentlinks editpage
                                templatebody}],
                description => "plugins to enable by default",


@@ -566,6 +566,14 @@ sub getsetup () {
                safe => 1,
                rebuild => 1,
        },
                safe => 1,
                rebuild => 1,
        },

+       deterministic => {
+               type => "boolean",
+               default => 0,
+               description => "try harder to produce deterministic output",
+               safe => 1,
+               rebuild => 1,
+               advanced => 1,
+       },

 }
 
 sub getlibdirs () {
 }
 
 sub getlibdirs () {


@@ -835,10 +843,9 @@ sub log_message ($$) {
                        $log_open=1;
                }
                eval {
                        $log_open=1;
                }
                eval {

-                       # keep a copy to avoid editing the original config repeatedly
-                       my $wikiname = $config{wikiname};
-                       utf8::encode($wikiname);
-                       Sys::Syslog::syslog($type, "[$wikiname] %s", join(" ", @_));
+                       my $message = "[$config{wikiname}] ".join(" ", @_);
+                       utf8::encode($message);
+                       Sys::Syslog::syslog($type, "%s", $message);

                };
                 if ($@) {
                     print STDERR "failed to syslog: $@" unless $log_failed;
                };
                 if ($@) {
                     print STDERR "failed to syslog: $@" unless $log_failed;


@@ -1217,7 +1224,7 @@ sub cgiurl (@) {
        }
 
        return $cgiurl."?".
        }
 
        return $cgiurl."?".

-               join("&", map $_."=".uri_escape_utf8($params{$_}), keys %params);
+               join("&", map $_."=".uri_escape_utf8($params{$_}), sort(keys %params));

 }
 
 sub cgiurl_abs (@) {
 }
 
 sub cgiurl_abs (@) {


@@ -1430,6 +1437,7 @@ sub userpage ($) {
        return length $config{userdir} ? "$config{userdir}/$user" : $user;
 }
 
        return length $config{userdir} ? "$config{userdir}/$user" : $user;
 }
 

+# Username to display for openid accounts.

 sub openiduser ($) {
        my $user=shift;
 
 sub openiduser ($) {
        my $user=shift;
 


@@ -1464,14 +1472,36 @@ sub openiduser ($) {
        return;
 }
 
        return;
 }
 

+# Username to display for emailauth accounts. 

 sub emailuser ($) {
        my $user=shift;
        if (defined $user && $user =~ m/(.+)@/) {
 sub emailuser ($) {
        my $user=shift;
        if (defined $user && $user =~ m/(.+)@/) {

-               return $1;
+               my $nick=$1;
+               # remove any characters from not allowed in wiki files
+               # 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;
 }
 
        }
        return;
 }
 

+# Some user information should not be exposed in commit metadata, etc.
+# This generates a cloaked form of such information.
+sub cloak ($) {
+       my $user=shift;
+       # cloak email address using http://xmlns.com/foaf/spec/#term_mbox_sha1sum
+       if ($user=~m/(.+)@/) {
+               my $nick=$1;
+               eval q{use Digest::SHA};
+               return $user if $@;
+               return $nick.'@'.Digest::SHA::sha1_hex("mailto:$user");
+       }
+       else {
+               return $user;
+       }
+}
+

 sub htmlize ($$$$) {
        my $page=shift;
        my $destpage=shift;
 sub htmlize ($$$$) {
        my $page=shift;
        my $destpage=shift;


@@ -1617,6 +1647,8 @@ sub preprocess ($$$;$$) {
                                if ($@) {
                                        my $error=$@;
                                        chomp $error;
                                if ($@) {
                                        my $error=$@;
                                        chomp $error;

+                                       eval q{use HTML::Entities};
+                                       $error = encode_entities($error);

                                        $ret="[[!$command <span class=\"error\">".
                                                gettext("Error").": $error"."</span>]]";
                                }
                                        $ret="[[!$command <span class=\"error\">".
                                                gettext("Error").": $error"."</span>]]";
                                }