* Support pages with utf8 filenames. Patch by Faidon Liambotis.

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 357c1cd2d0ed0567538b41d585f7483d86238847..4be5612f1bf8df3d3090dda0ad9963f866a201f4 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -3,8 +3,7 @@
 package IkiWiki;
 use warnings;
 use strict;
-use File::Spec;
-use HTML::Template;
+use encoding "utf8";
 
 use vars qw{%config %links %oldlinks %oldpagemtime %pagectime
             %renderedfiles %pagesources %depends %hooks};
@@ -36,6 +35,7 @@ sub defaultconfig () { #{{{
        svnpath => "trunk",
        srcdir => undef,
        destdir => undef,
+       pingurl => [],
        templatedir => "/usr/share/ikiwiki/templates",
        underlaydir => "/usr/share/ikiwiki/basewiki",
        setup => undef,
@@ -163,7 +163,12 @@ sub readfile ($;$) { #{{{
        
        local $/=undef;
        open (IN, $file) || error("failed to read $file: $!");
-       binmode(IN) if $binary;
+       if (! $binary) {
+               binmode(IN, ":utf8");
+       }
+       else {
+               binmode(IN);
+       }
        my $ret=<IN>;
        close IN;
        return $ret;
@@ -195,7 +200,12 @@ sub writefile ($$$;$) { #{{{
        }
        
        open (OUT, ">$destdir/$file") || error("failed to write $destdir/$file: $!");
-       binmode(OUT) if $binary;
+       if (! $binary) {
+               binmode(OUT, ":utf8");
+       }
+       else {
+               binmode(OUT);
+       }
        print OUT $content;
        close OUT;
 } #}}}
@@ -293,6 +303,7 @@ sub htmllink ($$$;$$$) { #{{{
                        "\">?</a>$linktext</span>"
        }
        
+       require File::Spec;
        $bestlink=File::Spec->abs2rel($bestlink, dirname($page));
        
        if (! $noimageinline && isinlinableimage($bestlink)) {
@@ -330,7 +341,7 @@ sub unlockwiki () { #{{{
 } #}}}
 
 sub loadindex () { #{{{
-       open (IN, "$config{wikistatedir}/index") || return;
+       open (IN, "<:utf8", "$config{wikistatedir}/index") || return;
        while (<IN>) {
                $_=possibly_foolish_untaint($_);
                chomp;
@@ -362,7 +373,7 @@ sub saveindex () { #{{{
        if (! -d $config{wikistatedir}) {
                mkdir($config{wikistatedir});
        }
-       open (OUT, ">$config{wikistatedir}/index") || 
+       open (OUT, ">:utf8", "$config{wikistatedir}/index") || 
                error("cannot write to $config{wikistatedir}/index: $!");
        foreach my $page (keys %oldpagemtime) {
                next unless $oldpagemtime{$page};
@@ -379,13 +390,27 @@ sub saveindex () { #{{{
        close OUT;
 } #}}}
 
+sub template_params (@) { #{{{
+       my $filename=shift;
+       
+       require Encode;
+       require HTML::Template;
+       return filter => sub {
+                       my $text_ref = shift;
+                       $$text_ref=&Encode::decode_utf8($$text_ref);
+               },
+               filename => "$config{templatedir}/$filename", @_;
+} #}}}
+
+sub template ($;@) { #{{{
+       HTML::Template->new(template_params(@_));
+} #}}}
+
 sub misctemplate ($$) { #{{{
        my $title=shift;
        my $pagebody=shift;
        
-       my $template=HTML::Template->new(
-               filename => "$config{templatedir}/misc.tmpl"
-       );
+       my $template=template("misc.tmpl");
        $template->param(
                title => $title,
                indexlink => indexlink(),