X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/ad247de723cc540aaaae584cdceefaeb06f62284..23ab9057d2999de112880ee82a818149f42d0d7b:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 357c1cd2d..f8c1f9d3e 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -3,8 +3,8 @@
 package IkiWiki;
 use warnings;
 use strict;
-use File::Spec;
-use HTML::Template;
+use Encode;
+use open qw{:utf8 :std};
 
 use vars qw{%config %links %oldlinks %oldpagemtime %pagectime
             %renderedfiles %pagesources %depends %hooks};
@@ -36,12 +36,13 @@ sub defaultconfig () { #{{{
 	svnpath => "trunk",
 	srcdir => undef,
 	destdir => undef,
+	pingurl => [],
 	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',
 } #}}}
 	    
@@ -122,12 +123,10 @@ sub dirname ($) { #{{{
 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 ($) { #{{{
@@ -135,7 +134,7 @@ sub pagename ($) { #{{{
 
 	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;
 } #}}}
 
@@ -163,7 +162,7 @@ sub readfile ($;$) { #{{{
 	
 	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;
@@ -195,7 +194,7 @@ sub writefile ($$$;$) { #{{{
 	}
 	
 	open (OUT, ">$destdir/$file") || error("failed to write $destdir/$file: $!");
-	binmode(OUT) if $binary;
+	binmode(OUT) if ($binary);
 	print OUT $content;
 	close OUT;
 } #}}}
@@ -293,6 +292,7 @@ sub htmllink ($$$;$$$) { #{{{
 			"\">?</a>$linktext</span>"
 	}
 	
+	require File::Spec;
 	$bestlink=File::Spec->abs2rel($bestlink, dirname($page));
 	
 	if (! $noimageinline && isinlinableimage($bestlink)) {
@@ -379,13 +379,26 @@ sub saveindex () { #{{{
 	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;
 	
-	my $template=HTML::Template->new(
-		filename => "$config{templatedir}/misc.tmpl"
-	);
+	my $template=template("misc.tmpl");
 	$template->param(
 		title => $title,
 		indexlink => indexlink(),