* Allow preprocessor directives to be expanded in inlined blog pages.

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 357c1cd2d0ed0567538b41d585f7483d86238847..085953a17220fa50b44bf42892d7f0683f524d21 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -3,8 +3,12 @@
 package IkiWiki;
 use warnings;
 use strict;
 package IkiWiki;
 use warnings;
 use strict;

-use File::Spec;
-use HTML::Template;
+use Encode;
+use open qw{:utf8 :std};
+
+# Optimisation.
+use Memoize;
+memoize("abs2rel");

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


@@ -16,7 +20,7 @@ sub defaultconfig () { #{{{
        wiki_file_regexp => qr/(^[-[:alnum:]_.:\/+]+$)/,
        verbose => 0,
        wikiname => "wiki",
        wiki_file_regexp => qr/(^[-[:alnum:]_.:\/+]+$)/,
        verbose => 0,
        wikiname => "wiki",

-       default_pageext => ".mdwn",
+       default_pageext => "mdwn",

        cgi => 0,
        rcs => 'svn',
        notify => 0,
        cgi => 0,
        rcs => 'svn',
        notify => 0,


@@ -30,22 +34,45 @@ sub defaultconfig () { #{{{
        rebuild => 0,
        refresh => 0,
        getctime => 0,
        rebuild => 0,
        refresh => 0,
        getctime => 0,

+       w3mmode => 0,

        wrapper => undef,
        wrappermode => undef,
        svnrepo => undef,
        svnpath => "trunk",
        srcdir => undef,
        destdir => undef,
        wrapper => undef,
        wrappermode => undef,
        svnrepo => undef,
        svnpath => "trunk",
        srcdir => undef,
        destdir => undef,

+       pingurl => [],

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

-       plugin => [qw{inline htmlscrubber}],
+       plugin => [qw{mdwn inline htmlscrubber}],

        timeformat => '%c',
        timeformat => '%c',

+       locale => undef,

 } #}}}
 } #}}}

-           
+   

 sub checkconfig () { #{{{
 sub checkconfig () { #{{{

+       # locale stuff; avoid LC_ALL since it overrides everything
+       if (defined $ENV{LC_ALL}) {
+               $ENV{LANG} = $ENV{LC_ALL};
+               delete $ENV{LC_ALL};
+       }
+       if (defined $config{locale}) {
+               eval q{use POSIX};
+               $ENV{LANG} = $config{locale}
+                       if POSIX::setlocale(&POSIX::LANG, $config{locale});
+       }
+
+       if ($config{w3mmode}) {
+               eval q{use Cwd q{abs_path}};
+               $config{srcdir}=possibly_foolish_untaint(abs_path($config{srcdir}));
+               $config{destdir}=possibly_foolish_untaint(abs_path($config{destdir}));
+               $config{cgiurl}="file:///\$LIB/ikiwiki-w3m.cgi/".$config{cgiurl}
+                       unless $config{cgiurl} =~ m!file:///!;
+               $config{url}="file://".$config{destdir};
+       }
+

        if ($config{cgi} && ! length $config{url}) {
                error("Must specify url to wiki with --url when using --cgi\n");
        }
        if ($config{cgi} && ! length $config{url}) {
                error("Must specify url to wiki with --url when using --cgi\n");
        }


@@ -66,6 +93,14 @@ sub checkconfig () { #{{{
                require IkiWiki::Rcs::Stub;
        }
 
                require IkiWiki::Rcs::Stub;
        }
 

+       if (exists $hooks{checkconfig}) {
+                foreach my $id (keys %{$hooks{checkconfig}}) {
+                        $hooks{checkconfig}{$id}{call}->();
+                }
+        }
+} #}}}
+
+sub loadplugins () { #{{{

        foreach my $plugin (@{$config{plugin}}) {
                my $mod="IkiWiki::Plugin::".possibly_foolish_untaint($plugin);
                eval qq{use $mod};
        foreach my $plugin (@{$config{plugin}}) {
                my $mod="IkiWiki::Plugin::".possibly_foolish_untaint($plugin);
                eval qq{use $mod};


@@ -73,12 +108,6 @@ sub checkconfig () { #{{{
                        error("Failed to load plugin $mod: $@");
                }
        }
                        error("Failed to load plugin $mod: $@");
                }
        }

-
-       if (exists $hooks{checkconfig}) {
-                foreach my $id (keys %{$hooks{checkconfig}}) {
-                        $hooks{checkconfig}{$id}{call}->();
-                }
-        }

 } #}}}
 
 sub error ($) { #{{{
 } #}}}
 
 sub error ($) { #{{{


@@ -122,12 +151,10 @@ sub dirname ($) { #{{{
 sub pagetype ($) { #{{{
        my $page=shift;
        
 sub pagetype ($) { #{{{
        my $page=shift;
        

-       if ($page =~ /\.mdwn$/) {
-               return ".mdwn";
-       }
-       else {
-               return "unknown";
+       if ($page =~ /\.([^.]+)$/) {
+               return $1 if exists $hooks{htmlize}{$1};

        }
        }

+       return undef;

 } #}}}
 
 sub pagename ($) { #{{{
 } #}}}
 
 sub pagename ($) { #{{{


@@ -135,7 +162,7 @@ sub pagename ($) { #{{{
 
        my $type=pagetype($file);
        my $page=$file;
 
        my $type=pagetype($file);
        my $page=$file;

-       $page=~s/\Q$type\E*$// unless $type eq 'unknown';
+       $page=~s/\Q.$type\E*$// if defined $type;

        return $page;
 } #}}}
 
        return $page;
 } #}}}
 


@@ -163,7 +190,7 @@ 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;
+       binmode(IN) if ($binary);

        my $ret=<IN>;
        close IN;
        return $ret;
        my $ret=<IN>;
        close IN;
        return $ret;


@@ -195,7 +222,7 @@ 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;
+       binmode(OUT) if ($binary);

        print OUT $content;
        close OUT;
 } #}}}
        print OUT $content;
        close OUT;
 } #}}}


@@ -261,6 +288,19 @@ sub styleurl (;$) { #{{{
        return $page."style.css";
 } #}}}
 
        return $page."style.css";
 } #}}}
 

+sub abs2rel ($$) {
+       # Work around very innefficient behavior in File::Spec if abs2rel
+       # is passed two relative paths. It's much faster if paths are
+       # absolute!
+       my $path="/".shift;
+       my $base="/".shift;
+
+       require File::Spec;
+       my $ret=File::Spec->abs2rel($path, $base);
+       $ret=~s/^// if defined $ret;
+       return $ret;
+}
+

 sub htmllink ($$$;$$$) { #{{{
        my $lpage=shift; # the page doing the linking
        my $page=shift; # the page that will contain the link (different for inline)
 sub htmllink ($$$;$$$) { #{{{
        my $lpage=shift; # the page doing the linking
        my $page=shift; # the page that will contain the link (different for inline)


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

-       $bestlink=File::Spec->abs2rel($bestlink, dirname($page));
+       $bestlink=abs2rel($bestlink, dirname($page));

        
        if (! $noimageinline && isinlinableimage($bestlink)) {
                return "<img src=\"$bestlink\" alt=\"$linktext\" />";
        
        if (! $noimageinline && isinlinableimage($bestlink)) {
                return "<img src=\"$bestlink\" alt=\"$linktext\" />";


@@ -379,13 +419,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(),