X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/7a1e12675ec5f1ea605d4de06a0b82079073fb20..26c2c63c97e6bfa704357503fdfd8d8834838851:/IkiWiki/Plugin/inline.pm?ds=inline

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 6ecdf0d38..7bb71a436 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -9,12 +9,20 @@ use IkiWiki;
 sub import { #{{{
 	IkiWiki::hook(type => "preprocess", id => "inline", 
 		call => \&IkiWiki::preprocess_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", 
+		call => \&IkiWiki::pingurl);
 } # }}}
 
 # Back to ikiwiki namespace for the rest, this code is very much
 # internal to ikiwiki even though it's separated into a plugin.
 package IkiWiki;
-	
+
+my %toping;
+my $processing_inline=0;
+
 sub preprocess_inline (@) { #{{{
 	my %params=@_;
 
@@ -27,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}) {
@@ -44,26 +70,31 @@ 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;
+	foreach my $page (@list) {
 		$template->param(pagelink => htmllink($params{page}, $params{page}, $page));
-		$template->param(content => get_inline_content($params{page}, $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
@@ -71,36 +102,23 @@ sub preprocess_inline (@) { #{{{
 	# only supports listing one file per page.
 	if ($config{rss}) {
 		writefile(rsspage($params{page}), $config{destdir},
-			genrss($params{page}, @pages));
+			genrss($params{page}, @list));
+		$toping{$params{page}}=1 unless $config{rebuild};
 	}
 	
-	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;
-		}
-	}
+	$processing_inline=0;
 
-	@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, linkify($page, $parentpage, readfile(srcfile($file))));
+	if (defined $type) {
+		return htmlize($type, preprocess($page, $destpage, linkify($page, $destpage, readfile(srcfile($file)))));
 	}
 	else {
 		return "";
@@ -121,8 +139,8 @@ sub absolute_urls ($$) { #{{{
 
 	$url=~s/[^\/]+$//;
 	
-	$content=~s/<a\s+href="(?!http:\/\/)([^"]+)"/<a href="$url$1"/ig;
-	$content=~s/<img\s+src="(?!http:\/\/)([^"]+)"/<img src="$url$1"/ig;
+	$content=~s/<a\s+href="(?![^:]+:\/\/)([^"]+)"/<a href="$url$1"/ig;
+	$content=~s/<img\s+src="(?![^:]+:\/\/)([^"]+)"/<img src="$url$1"/ig;
 	return $content;
 } #}}}
 
@@ -138,8 +156,8 @@ sub genrss ($@) { #{{{
 	
 	my $url="$config{url}/".htmlpage($page);
 	
-	my $template=HTML::Template->new(blind_cache => 1,
-		filename => "$config{templatedir}/rsspage.tmpl");
+	my $template=template("rsspage.tmpl", blind_cache => 1,
+		die_on_bad_params => 0);
 	
 	my @items;
 	foreach my $p (@pages) {
@@ -147,7 +165,8 @@ sub genrss ($@) { #{{{
 			itemtitle => pagetitle(basename($p)),
 			itemurl => "$config{url}/$renderedfiles{$p}",
 			itempubdate => date_822($pagectime{$p}),
-			itemcontent => absolute_urls(get_inline_content($page, $p), $url),
+			itemcontent => absolute_urls(get_inline_content($p, $page), $url),
+			page => $p, # used by category adding code in tag plugin
 		} if exists $renderedfiles{$p};
 	}
 
@@ -157,7 +176,41 @@ sub genrss ($@) { #{{{
 		items => \@items,
 	);
 	
+	run_hooks(pagetemplate => sub {
+		shift->(page => $page, destpage => $page,
+			template => $template);
+	});
+	
 	return $template->output;
 } #}}}
 
+sub pingurl (@) { #{{{
+	return unless $config{pingurl} && %toping;
+
+	eval q{require RPC::XML::Client};
+	if ($@) {
+		debug("RPC::XML::Client not found, not pinging");
+		return;
+	}
+
+	foreach my $page (keys %toping) {
+		my $title=pagetitle(basename($page));
+		my $url="$config{url}/".htmlpage($page);
+		foreach my $pingurl (@{$config{pingurl}}) {
+			my $client = RPC::XML::Client->new($pingurl);
+			my $req = RPC::XML::request->new('weblogUpdates.ping',
+				$title, $url);
+			debug("Pinging $pingurl for $page");
+			my $res = $client->send_request($req);
+			if (! ref $res) {
+				debug("Did not receive response to ping");
+			}
+			my $r=$res->value;
+			if (! exists $r->{flerror} || $r->{flerror}) {
+				debug("Ping rejected: ".$r->{message});
+			}
+		}
+	}
+} #}}}
+
 1