X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/b0e7e2e123079a2e68924cfb90d19c44571b1f65..e4ccc4f3b09aaaa4f64bdba1d6ffff24e924fd20:/IkiWiki/Plugin/inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 6bcd59a9f..110410abc 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -21,6 +21,7 @@ sub import { #{{{
 package IkiWiki;
 
 my %toping;
+my $processing_inline=0;
 
 sub preprocess_inline (@) { #{{{
 	my %params=@_;
@@ -34,14 +35,32 @@ sub preprocess_inline (@) { #{{{
 	if (! exists $params{show} && $params{archive} eq "no") {
 		$params{show}=10;
 	}
+
+	# Avoid nested inlines, to avoid loops etc.
+	if ($processing_inline) {
+		return "";
+	}
+	$processing_inline=1;
+
+	my @list;
+	foreach my $page (keys %pagesources) {
+		next if $page eq $params{page};
+		if (globlist_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 $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}) {
@@ -51,26 +70,36 @@ sub preprocess_inline (@) { #{{{
 	}
 	elsif ($config{rss}) {
 		# Add a rss link button.
-		my $linktemplate=HTML::Template->new(blind_cache => 1,
-			filename => "$config{templatedir}/rsslink.tmpl");
+		my $linktemplate=template("rsslink.tmpl", blind_cache => 1);
 		$linktemplate->param(rssurl => rsspage(basename($params{page})));
 		$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(
+		(($params{archive} eq "no")
+			? "inlinepage.tmpl"
+			: "inlinepagetitle.tmpl"),
+		blind_cache => 1,
+	);
 	
-	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))
+	foreach my $page (@list) {
+		# 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{page}));
+		$template->param(pageurl => $link);
+		$template->param(title => pagetitle(basename($page)));
+		$template->param(content => get_inline_content($page, $params{page}))
 			if $params{archive} eq "no";
 		$template->param(ctime => displaytime($pagectime{$page}));
+
+		run_hooks(pagetemplate => sub {
+			shift->(page => $page, destpage => $params{page},
+				template => $template,);
+		});
+
 		$ret.=$template->output;
+		$template->clear_params;
 	}
 	
 	# TODO: should really add this to renderedfiles and call
@@ -78,37 +107,23 @@ sub preprocess_inline (@) { #{{{
 	# only supports listing one file per page.
 	if ($config{rss}) {
 		writefile(rsspage($params{page}), $config{destdir},
-			genrss($params{page}, @pages));
-		$toping{$params{page}}=1;
+			genrss($params{page}, @list));
+		$toping{$params{page}}=1 unless $config{rebuild};
 	}
 	
-	return $ret;
-} #}}}
+	$processing_inline=0;
 
-sub blog_list ($$) { #{{{
-	my $globlist=shift;
-	my $maxitems=shift;
-
-	my @list;
-	foreach my $page (keys %pagesources) {
-		if (globlist_match($page, $globlist)) {
-			push @list, $page;
-		}
-	}
-
-	@list=sort { $pagectime{$b} <=> $pagectime{$a} } @list;
-	return @list if ! $maxitems || @list <= $maxitems;
-	return @list[0..$maxitems - 1];
+	return $ret;
 } #}}}
 
 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($type, preprocess($page, $destpage, linkify($page, $destpage, readfile(srcfile($file)))));
 	}
 	else {
 		return "";
@@ -146,25 +161,39 @@ sub genrss ($@) { #{{{
 	
 	my $url="$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, 
+		die_on_bad_params => 0);
+	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};
+
+		$itemtemplate->param(
+			title => pagetitle(basename($p)),
+			url => "$config{url}/$renderedfiles{$p}",
+			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,
 	);
 	
+	run_hooks(pagetemplate => sub {
+		shift->(page => $page, destpage => $page,
+			template => $template);
+	});
+	
 	return $template->output;
 } #}}}
 
@@ -174,6 +203,7 @@ sub pingurl (@) { #{{{
 	eval q{require RPC::XML::Client};
 	if ($@) {
 		debug("RPC::XML::Client not found, not pinging");
+		return;
 	}
 
 	foreach my $page (keys %toping) {