X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/5466a1daf99e8e4c67a19f871aaf558312569652..c1160151d354b7f46cafcf0e5e10402322d44e58:/IkiWiki.pm?ds=sidebyside

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 81a72d43d..c2c3aac83 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,14 @@ 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',
 } #}}}
 	    
 sub checkconfig () { #{{{
@@ -121,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 ($) { #{{{
@@ -134,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;
 } #}}}
 
@@ -162,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;
@@ -194,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;
 } #}}}
@@ -260,8 +260,9 @@ sub styleurl (;$) { #{{{
 	return $page."style.css";
 } #}}}
 
-sub htmllink ($$;$$$) { #{{{
-	my $page=shift;
+sub htmllink ($$$;$$$) { #{{{
+	my $lpage=shift; # the page doing the linking
+	my $page=shift; # the page that will contain the link (different for inline)
 	my $link=shift;
 	my $noimageinline=shift; # don't turn links into inline html images
 	my $forcesubpage=shift; # force a link to a subpage
@@ -269,10 +270,10 @@ sub htmllink ($$;$$$) { #{{{
 
 	my $bestlink;
 	if (! $forcesubpage) {
-		$bestlink=bestlink($page, $link);
+		$bestlink=bestlink($lpage, $link);
 	}
 	else {
-		$bestlink="$page/".lc($link);
+		$bestlink="$lpage/".lc($link);
 	}
 
 	$linktext=pagetitle(basename($link)) unless defined $linktext;
@@ -281,17 +282,17 @@ sub htmllink ($$;$$$) { #{{{
 	
 	# TODO BUG: %renderedfiles may not have it, if the linked to page
 	# was also added and isn't yet rendered! Note that this bug is
-	# masked by the bug mentioned below that makes all new files
-	# be rendered twice.
+	# masked by the bug that makes all new files be rendered twice.
 	if (! grep { $_ eq $bestlink } values %renderedfiles) {
 		$bestlink=htmlpage($bestlink);
 	}
 	if (! grep { $_ eq $bestlink } values %renderedfiles) {
 		return "<span><a href=\"".
-			cgiurl(do => "create", page => $link, from =>$page).
+			cgiurl(do => "create", page => $link, from => $page).
 			"\">?</a>$linktext</span>"
 	}
 	
+	require File::Spec;
 	$bestlink=File::Spec->abs2rel($bestlink, dirname($page));
 	
 	if (! $noimageinline && isinlinableimage($bestlink)) {
@@ -378,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(),
@@ -400,13 +414,27 @@ sub glob_match ($$) { #{{{
 	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 ($$) { #{{{