Merge branch 'master' into debian-jessie-backports

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

diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index 3bc4ea8dd69b1d67329ec1db81bdd2e4ac9d19cf..5ec254f84ff9af7a9a3cd69b73902923b43527bc 100644 (file)
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -5,6 +5,7 @@ use warnings;
 use strict;
 use IkiWiki;
 use Encode;
 use strict;
 use IkiWiki;
 use Encode;

+use URI::Escape q{uri_escape_utf8};

 use open qw{:utf8 :std};
 
 sub import {
 use open qw{:utf8 :std};
 
 sub import {


@@ -132,10 +133,10 @@ sub bzr_author ($) {
        my $ipaddr=$session->remote_addr();
 
        if (defined $user) {
        my $ipaddr=$session->remote_addr();
 
        if (defined $user) {

-               return IkiWiki::possibly_foolish_untaint($user);
+               return IkiWiki::possibly_foolish_untaint(IkiWiki::cloak($user));

        }
        elsif (defined $ipaddr) {
        }
        elsif (defined $ipaddr) {

-               return "Anonymous from ".IkiWiki::possibly_foolish_untaint($ipaddr);
+               return "Anonymous from ".IkiWiki::possibly_foolish_untaint(IkiWiki::cloak($ipaddr));

        }
        else {
                return "Anonymous";
        }
        else {
                return "Anonymous";


@@ -194,7 +195,7 @@ sub rcs_add ($) {
 sub rcs_remove ($) {
        my ($file) = @_;
 
 sub rcs_remove ($) {
        my ($file) = @_;
 

-       my @cmdline = ("bzr", "rm", "--force", "--quiet", "$config{srcdir}/$file");
+       my @cmdline = ("bzr", "rm", "--quiet", "$config{srcdir}/$file");

        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
        }
        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
        }


@@ -242,8 +243,10 @@ sub rcs_recentchanges ($) {
                        # Skip source name in renames
                        $filename =~ s/^.* => //;
 
                        # Skip source name in renames
                        $filename =~ s/^.* => //;
 

+                       my $efilename = uri_escape_utf8($filename);
+

                        my $diffurl = defined $config{'diffurl'} ? $config{'diffurl'} : "";
                        my $diffurl = defined $config{'diffurl'} ? $config{'diffurl'} : "";

-                       $diffurl =~ s/\[\[file\]\]/$filename/go;
+                       $diffurl =~ s/\[\[file\]\]/$efilename/go;

                        $diffurl =~ s/\[\[file-id\]\]/$fileid/go;
                        $diffurl =~ s/\[\[r2\]\]/$info->{revno}/go;
 
                        $diffurl =~ s/\[\[file-id\]\]/$fileid/go;
                        $diffurl =~ s/\[\[r2\]\]/$info->{revno}/go;
 


@@ -299,7 +302,7 @@ sub extract_timestamp (@) {
        open (my $out, "-|", @_);
        my @log = bzr_log($out);
 
        open (my $out, "-|", @_);
        my @log = bzr_log($out);
 

-       if (length @log < 1) {
+       if (length(scalar(@log)) < 1) {

                return 0;
        }
 
                return 0;
        }