X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/14ca7095cb19087e4951bf775d4dbfdc30247ba3..efecdae0914773b224b76a4247e1aaf3fd24ee0e:/IkiWiki/Plugin/inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 05563b946..79e64beac 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -5,14 +5,18 @@ package IkiWiki::Plugin::inline;
 use warnings;
 use strict;
 use IkiWiki;
+use IkiWiki::Render; # for displaytime
+use URI;
 
 sub import { #{{{
-	IkiWiki::hook(type => "preprocess", id => "inline", 
+	hook(type => "preprocess", id => "inline", 
 		call => \&IkiWiki::preprocess_inline);
+	hook(type => "pagetemplate", id => "inline",
+		call => \&IkiWiki::pagetemplate_inline);
 	# Hook to change to do pinging since it's called late.
 	# This ensures each page only pings once and prevents slow
 	# pings interrupting page builds.
-	IkiWiki::hook(type => "change", id => "inline", 
+	hook(type => "change", id => "inline", 
 		call => \&IkiWiki::pingurl);
 } # }}}
 
@@ -21,94 +25,159 @@ sub import { #{{{
 package IkiWiki;
 
 my %toping;
+my %rsslinks;
+
+sub yesno ($) { #{{{
+	my $val=shift;
+	return (defined $val && lc($val) eq "yes");
+} #}}}
 
 sub preprocess_inline (@) { #{{{
 	my %params=@_;
-
+	
 	if (! exists $params{pages}) {
 		return "";
 	}
-	if (! exists $params{archive}) {
-		$params{archive}="no";
-	}
-	if (! exists $params{show} && $params{archive} eq "no") {
+	my $raw=yesno($params{raw});
+	my $archive=yesno($params{archive});
+	my $rss=exists $params{rss} ? yesno($params{rss}) : 1;
+	if (! exists $params{show} && ! $archive) {
 		$params{show}=10;
 	}
+	my $desc;
+	if (exists $params{description}) {
+		$desc = $params{description} 
+	} else {
+		$desc = $config{wikiname};
+	}
+	my $actions=yesno($params{actions});
+
+	my @list;
+	foreach my $page (keys %pagesources) {
+		next if $page eq $params{page};
+		if (pagespec_match($page, $params{pages})) {
+			push @list, $page;
+		}
+	}
+	@list=sort { $pagectime{$b} <=> $pagectime{$a} } @list;
+	if ($params{show} && @list > $params{show}) {
+		@list=@list[0..$params{show} - 1];
+	}
+
 	add_depends($params{page}, $params{pages});
 
+	my $rssurl=rsspage(basename($params{page}));
 	my $ret="";
-	
-	if (exists $params{rootpage}) {
+
+	if (exists $params{rootpage} && $config{cgiurl}) {
 		# Add a blog post form, with a rss link button.
-		my $formtemplate=HTML::Template->new(blind_cache => 1,
-			filename => "$config{templatedir}/blogpost.tmpl");
+		my $formtemplate=template("blogpost.tmpl", blind_cache => 1);
 		$formtemplate->param(cgiurl => $config{cgiurl});
 		$formtemplate->param(rootpage => $params{rootpage});
 		if ($config{rss}) {
-			$formtemplate->param(rssurl => rsspage(basename($params{page})));
+			$formtemplate->param(rssurl => $rssurl);
 		}
 		$ret.=$formtemplate->output;
 	}
-	elsif ($config{rss}) {
+	elsif ($config{rss} && $rss) {
 		# Add a rss link button.
-		my $linktemplate=HTML::Template->new(blind_cache => 1,
-			filename => "$config{templatedir}/rsslink.tmpl");
-		$linktemplate->param(rssurl => rsspage(basename($params{page})));
+		my $linktemplate=template("rsslink.tmpl", blind_cache => 1);
+		$linktemplate->param(rssurl => $rssurl);
 		$ret.=$linktemplate->output;
 	}
 	
-	my $template=HTML::Template->new(blind_cache => 1,
-		filename => (($params{archive} eq "no") 
-				? "$config{templatedir}/inlinepage.tmpl"
-				: "$config{templatedir}/inlinepagetitle.tmpl"));
+	my $template=template(
+		($archive ? "inlinepagetitle.tmpl" : "inlinepage.tmpl"),
+		blind_cache => 1,
+	) unless $raw;
 	
-	my @pages;
-	foreach my $page (blog_list($params{pages}, $params{show})) {
-		next if $page eq $params{page};
-		push @pages, $page;
-		$template->param(pagelink => htmllink($params{page}, $params{page}, $page));
-		$template->param(content => get_inline_content($params{page}, $page))
-			if $params{archive} eq "no";
-		$template->param(ctime => displaytime($pagectime{$page}));
-		$ret.=$template->output;
+	foreach my $page (@list) {
+		if (! $raw) {
+			# Get the content before populating the template,
+			# since getting the content uses the same template
+			# if inlines are nested.
+			# TODO: if $archive=1, the only reason to do this
+			# is to let the meta plugin get page title info; so stop
+			# calling this next line then once the meta plugin can
+			# store that accross runs (also tags plugin).
+			my $content=get_inline_content($page, $params{destpage});
+			# Don't use htmllink because this way the title is separate
+			# and can be overridden by other plugins.
+			my $link=htmlpage(bestlink($params{page}, $page));
+			$link=abs2rel($link, dirname($params{destpage}));
+			$template->param(pageurl => $link);
+			$template->param(title => pagetitle(basename($page)));
+			$template->param(content => $content);
+			$template->param(ctime => displaytime($pagectime{$page}));
+
+			if ($actions) {
+				my $file = $pagesources{$page};
+				my $type = pagetype($file);
+				if ($config{discussion}) {
+					$template->param(have_actions => 1);
+					$template->param(discussionlink => htmllink($page, $page, "Discussion", 1, 1));
+				}
+				if (length $config{cgiurl} && defined $type) {
+					$template->param(have_actions => 1);
+					$template->param(editurl => cgiurl(do => "edit", page => $page));
+				}
+			}
+
+			run_hooks(pagetemplate => sub {
+				shift->(page => $page, destpage => $params{page},
+					template => $template,);
+			});
+
+			$ret.=$template->output;
+			$template->clear_params;
+		}
+		else {
+			my $file=$pagesources{$page};
+			my $type=pagetype($file);
+			if (defined $type) {
+				$ret.="\n".
+				      linkify($page, $params{page},
+				      preprocess($page, $params{page},
+				      filter($page,
+				      readfile(srcfile($file)))));
+			}
+		}
 	}
 	
 	# TODO: should really add this to renderedfiles and call
 	# check_overwrite, but currently renderedfiles
 	# only supports listing one file per page.
-	if ($config{rss}) {
+	if ($config{rss} && $rss) {
 		writefile(rsspage($params{page}), $config{destdir},
-			genrss($params{page}, @pages));
-		$toping{$params{page}}=1;
+			genrss($desc, $params{page}, @list));
+		$toping{$params{page}}=1 unless $config{rebuild};
+		$rsslinks{$params{destpage}}=qq{<link rel="alternate" type="application/rss+xml" title="RSS" href="$rssurl" />};
 	}
 	
 	return $ret;
 } #}}}
 
-sub blog_list ($$) { #{{{
-	my $globlist=shift;
-	my $maxitems=shift;
-
-	my @list;
-	foreach my $page (keys %pagesources) {
-		if (globlist_match($page, $globlist)) {
-			push @list, $page;
-		}
-	}
+sub pagetemplate_inline (@) { #{{{
+	my %params=@_;
+	my $page=$params{page};
+	my $template=$params{template};
 
-	@list=sort { $pagectime{$b} <=> $pagectime{$a} } @list;
-	return @list if ! $maxitems || @list <= $maxitems;
-	return @list[0..$maxitems - 1];
+	$template->param(rsslink => $rsslinks{$page})
+		if exists $rsslinks{$page} && $template->query(name => "rsslink");
 } #}}}
 
 sub get_inline_content ($$) { #{{{
-	my $parentpage=shift;
 	my $page=shift;
+	my $destpage=shift;
 	
 	my $file=$pagesources{$page};
 	my $type=pagetype($file);
-	if ($type ne 'unknown') {
-		return htmlize($type, preprocess($page, linkify($page, $parentpage, readfile(srcfile($file))), 1));
+	if (defined $type) {
+		return htmlize($page, $type,
+		       linkify($page, $destpage,
+		       preprocess($page, $destpage,
+		       filter($page,
+		       readfile(srcfile($file))))));
 	}
 	else {
 		return "";
@@ -119,7 +188,11 @@ sub date_822 ($) { #{{{
 	my $time=shift;
 
 	eval q{use POSIX};
-	return POSIX::strftime("%a, %d %b %Y %H:%M:%S %z", localtime($time));
+	my $lc_time= POSIX::setlocale(&POSIX::LC_TIME);
+	POSIX::setlocale(&POSIX::LC_TIME, "C");
+	my $ret=POSIX::strftime("%a, %d %b %Y %H:%M:%S %z", localtime($time));
+	POSIX::setlocale(&POSIX::LC_TIME, $lc_time);
+	return $ret;
 } #}}}
 
 sub absolute_urls ($$) { #{{{
@@ -140,30 +213,48 @@ sub rsspage ($) { #{{{
 	return $page.".rss";
 } #}}}
 
-sub genrss ($@) { #{{{
+sub genrss ($$@) { #{{{
+	my $desc=shift;
 	my $page=shift;
 	my @pages=@_;
 	
-	my $url="$config{url}/".htmlpage($page);
+	my $url=URI->new(encode_utf8($config{url}."/".htmlpage($page)));
 	
-	my $template=HTML::Template->new(blind_cache => 1,
-		filename => "$config{templatedir}/rsspage.tmpl");
-	
-	my @items;
+	my $itemtemplate=template("rssitem.tmpl", blind_cache => 1);
+	my $content="";
 	foreach my $p (@pages) {
-		push @items, {
-			itemtitle => pagetitle(basename($p)),
-			itemurl => "$config{url}/$renderedfiles{$p}",
-			itempubdate => date_822($pagectime{$p}),
-			itemcontent => absolute_urls(get_inline_content($page, $p), $url),
-		} if exists $renderedfiles{$p};
+		next unless exists $renderedfiles{$p};
+
+		my $u=URI->new(encode_utf8("$config{url}/$renderedfiles{$p}"));
+
+		$itemtemplate->param(
+			title => pagetitle(basename($p)),
+			url => $u,
+			permalink => $u,
+			pubdate => date_822($pagectime{$p}),
+			content => absolute_urls(get_inline_content($p, $page), $url),
+		);
+		run_hooks(pagetemplate => sub {
+			shift->(page => $p, destpage => $page,
+				template => $itemtemplate);
+		});
+
+		$content.=$itemtemplate->output;
+		$itemtemplate->clear_params;
 	}
 
+	my $template=template("rsspage.tmpl", blind_cache => 1);
 	$template->param(
 		title => $config{wikiname},
+		wikiname => $config{wikiname},
 		pageurl => $url,
-		items => \@items,
+		content => $content,
+		rssdesc => $desc,
 	);
+	run_hooks(pagetemplate => sub {
+		shift->(page => $page, destpage => $page,
+			template => $template);
+	});
 	
 	return $template->output;
 } #}}}
@@ -191,7 +282,7 @@ sub pingurl (@) { #{{{
 			}
 			my $r=$res->value;
 			if (! exists $r->{flerror} || $r->{flerror}) {
-				debug("Ping rejected: ".$r->{message});
+				debug("Ping rejected: ".(exists $r->{message} ? $r->{message} : "[unknown reason]"));
 			}
 		}
 	}