Encode is used in nearly all code paths so stop loading it on demand

[ikiwiki.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index ce9542f628ecbc055ecd331742e438ef3e6f56e9..7be1c7f589c0f9cccddc1a05e209a2f55da1f6a2 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -3,8 +3,8 @@
 package IkiWiki;
 use warnings;
 use strict;
 package IkiWiki;
 use warnings;
 use strict;

-use File::Spec;
-use HTML::Template;
+use encoding "utf8"; # force use of utf8 for io layer
+use Encode;

 
 use vars qw{%config %links %oldlinks %oldpagemtime %pagectime
             %renderedfiles %pagesources %depends %hooks};
 
 use vars qw{%config %links %oldlinks %oldpagemtime %pagectime
             %renderedfiles %pagesources %depends %hooks};


@@ -36,6 +36,7 @@ sub defaultconfig () { #{{{
        svnpath => "trunk",
        srcdir => undef,
        destdir => undef,
        svnpath => "trunk",
        srcdir => undef,
        destdir => undef,

+       pingurl => [],

        templatedir => "/usr/share/ikiwiki/templates",
        underlaydir => "/usr/share/ikiwiki/basewiki",
        setup => undef,
        templatedir => "/usr/share/ikiwiki/templates",
        underlaydir => "/usr/share/ikiwiki/basewiki",
        setup => undef,


@@ -163,7 +164,12 @@ sub readfile ($;$) { #{{{
        
        local $/=undef;
        open (IN, $file) || error("failed to read $file: $!");
        
        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;
        my $ret=<IN>;
        close IN;
        return $ret;


@@ -195,7 +201,12 @@ sub writefile ($$$;$) { #{{{
        }
        
        open (OUT, ">$destdir/$file") || error("failed to write $destdir/$file: $!");
        }
        
        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;
 } #}}}
        print OUT $content;
        close OUT;
 } #}}}


@@ -293,6 +304,7 @@ sub htmllink ($$$;$$$) { #{{{
                        "\">?</a>$linktext</span>"
        }
        
                        "\">?</a>$linktext</span>"
        }
        

+       require File::Spec;

        $bestlink=File::Spec->abs2rel($bestlink, dirname($page));
        
        if (! $noimageinline && isinlinableimage($bestlink)) {
        $bestlink=File::Spec->abs2rel($bestlink, dirname($page));
        
        if (! $noimageinline && isinlinableimage($bestlink)) {


@@ -330,7 +342,7 @@ sub unlockwiki () { #{{{
 } #}}}
 
 sub loadindex () { #{{{
 } #}}}
 
 sub loadindex () { #{{{

-       open (IN, "$config{wikistatedir}/index") || return;
+       open (IN, "<:utf8", "$config{wikistatedir}/index") || return;

        while (<IN>) {
                $_=possibly_foolish_untaint($_);
                chomp;
        while (<IN>) {
                $_=possibly_foolish_untaint($_);
                chomp;


@@ -362,7 +374,7 @@ sub saveindex () { #{{{
        if (! -d $config{wikistatedir}) {
                mkdir($config{wikistatedir});
        }
        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};
                error("cannot write to $config{wikistatedir}/index: $!");
        foreach my $page (keys %oldpagemtime) {
                next unless $oldpagemtime{$page};


@@ -379,13 +391,26 @@ sub saveindex () { #{{{
        close OUT;
 } #}}}
 
        close OUT;
 } #}}}
 

+sub template_params (@) { #{{{
+       my $filename=shift;
+       
+       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;
        
 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(),
        $template->param(
                title => $title,
                indexlink => indexlink(),


@@ -401,13 +426,27 @@ sub glob_match ($$) { #{{{
        my $page=shift;
        my $glob=shift;
 
        my $page=shift;
        my $glob=shift;
 

-       # turn glob into safe regexp
-       $glob=quotemeta($glob);
-       $glob=~s/\\\*/.*/g;
-       $glob=~s/\\\?/./g;
-       $glob=~s!\\/!/!g;
-       
-       $page=~/^$glob$/i;
+       if ($glob =~ /^link\((.+)\)$/) {
+               my $rev = $links{$page} or return undef;
+               foreach my $p (@$rev) {
+                       return 1 if lc $p eq $1;
+               }
+               return 0;
+       } elsif ($glob =~ /^backlink\((.+)\)$/) {
+               my $rev = $links{$1} or return undef;
+               foreach my $p (@$rev) {
+                       return 1 if lc $p eq $page;
+               }
+               return 0;
+       } else {
+               # turn glob into safe regexp
+               $glob=quotemeta($glob);
+               $glob=~s/\\\*/.*/g;
+               $glob=~s/\\\?/./g;
+               $glob=~s!\\/!/!g;
+               
+               return $page=~/^$glob$/i;
+       }

 } #}}}
 
 sub globlist_match ($$) { #{{{
 } #}}}
 
 sub globlist_match ($$) { #{{{