X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/74a56db8d6fb50dd408f42991a20ce74267d935f..4bfdbd4858bc7842df97902e0bc9bd5d2bef861e:/IkiWiki/Plugin/inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 3a03b554a..b40303078 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -14,7 +14,7 @@ my %page_numfeeds;
 sub import { #{{{
 	hook(type => "getopt", id => "inline", call => \&getopt);
 	hook(type => "checkconfig", id => "inline", call => \&checkconfig);
-	hook(type => "sessioncgi", id => "skeleton", call => \&sessioncgi);
+	hook(type => "sessioncgi", id => "inline", call => \&sessioncgi);
 	hook(type => "preprocess", id => "inline", 
 		call => \&IkiWiki::preprocess_inline);
 	hook(type => "pagetemplate", id => "inline",
@@ -34,6 +34,8 @@ sub getopt () { #{{{
 	GetOptions(
 		"rss!" => \$config{rss},
 		"atom!" => \$config{atom},
+		"allowrss!" => \$config{allowrss},
+		"allowatom!" => \$config{allowatom},
 	);
 }
 
@@ -91,11 +93,10 @@ sub preprocess_inline (@) { #{{{
 	}
 	my $raw=yesno($params{raw});
 	my $archive=yesno($params{archive});
-	my $rss=($config{rss} && exists $params{rss}) ? yesno($params{rss}) : $config{rss};
-	my $atom=($config{atom} && exists $params{atom}) ? yesno($params{atom}) : $config{atom};
+	my $rss=(($config{rss} || $config{allowrss}) && exists $params{rss}) ? yesno($params{rss}) : $config{rss};
+	my $atom=(($config{atom} || $config{allowatom}) && exists $params{atom}) ? yesno($params{atom}) : $config{atom};
 	my $quick=exists $params{quick} ? yesno($params{quick}) : 0;
 	my $feeds=exists $params{feeds} ? yesno($params{feeds}) : !$quick;
-	$feeds=0 if $params{preview};
 	my $feedonly=yesno($params{feedonly});
 	if (! exists $params{show} && ! $archive) {
 		$params{show}=10;
@@ -152,7 +153,12 @@ sub preprocess_inline (@) { #{{{
 	# that if they are removed or otherwise changed, the inline will be
 	# sure to be updated.
 	add_depends($params{page}, join(" or ", @list));
-	
+	# Force a scan of this page so any metadata that appears after this
+	# inline directive is available when inlining. The page normally 
+	# wouldn't be scanned if it's only being rebuilt because of a
+	# depedency.
+	IkiWiki::scan($pagesources{$params{page}});
+
 	my $feednum="";
 
 	my $feedid=join("\0", map { $_."\0".$params{$_} } sort keys %params);
@@ -161,7 +167,9 @@ sub preprocess_inline (@) { #{{{
 	}
 	else {
 		if (exists $page_numfeeds{$params{destpage}}) {
-			$feednum=$knownfeeds{$feedid}=++$page_numfeeds{$params{destpage}};
+			if ($feeds) {
+				$feednum=$knownfeeds{$feedid}=++$page_numfeeds{$params{destpage}};
+			}
 		}
 		else {
 			$feednum=$knownfeeds{$feedid}="";
@@ -171,11 +179,11 @@ sub preprocess_inline (@) { #{{{
 		}
 	}
 
-	my $rssurl=basename(rsspage($params{destpage}).$feednum);
-	my $atomurl=basename(atompage($params{destpage}).$feednum);
+	my $rssurl=basename(rsspage($params{destpage}).$feednum) if $feeds && $rss;
+	my $atomurl=basename(atompage($params{destpage}).$feednum) if $feeds && $atom;
 	my $ret="";
 
-	if ($config{cgiurl} && (exists $params{rootpage} ||
+	if ($config{cgiurl} && ! $params{preview} && (exists $params{rootpage} ||
 			(exists $params{postform} && yesno($params{postform})))) {
 		# Add a blog post form, with feed buttons.
 		my $formtemplate=template("blogpost.tmpl", blind_cache => 1);
@@ -194,7 +202,7 @@ sub preprocess_inline (@) { #{{{
 		}
 		$ret.=$formtemplate->output;
 	}
-	elsif ($feeds) {
+	elsif ($feeds && !$params{preview}) {
 		# Add feed buttons.
 		my $linktemplate=template("feedlink.tmpl", blind_cache => 1);
 		$linktemplate->param(rssurl => $rssurl) if $rss;
@@ -224,6 +232,8 @@ sub preprocess_inline (@) { #{{{
 				$template->param(pageurl => urlto(bestlink($params{page}, $page), $params{destpage}));
 				$template->param(title => pagetitle(basename($page)));
 				$template->param(ctime => displaytime($pagectime{$page}, $params{timeformat}));
+				$template->param(first => 1) if $page eq $list[0];
+				$template->param(last => 1) if $page eq $list[$#list];
 	
 				if ($actions) {
 					my $file = $pagesources{$page};
@@ -279,18 +289,22 @@ sub preprocess_inline (@) { #{{{
 		if ($rss) {
 			my $rssp=rsspage($params{destpage}).$feednum;
 			will_render($params{destpage}, $rssp);
-			writefile($rssp, $config{destdir},
-				genfeed("rss", $rssurl, $desc, $params{destpage}, @list));
-			$toping{$params{destpage}}=1 unless $config{rebuild};
-			$feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/rss+xml" title="RSS" href="$rssurl" />};
+			if (! $params{preview}) {
+				writefile($rssp, $config{destdir},
+					genfeed("rss", $rssurl, $desc, $params{destpage}, @list));
+				$toping{$params{destpage}}=1 unless $config{rebuild};
+				$feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/rss+xml" title="RSS" href="$rssurl" />};
+			}
 		}
 		if ($atom) {
 			my $atomp=atompage($params{destpage}).$feednum;
 			will_render($params{destpage}, $atomp);
-			writefile($atomp, $config{destdir},
-				genfeed("atom", $atomurl, $desc, $params{destpage}, @list));
-			$toping{$params{destpage}}=1 unless $config{rebuild};
-			$feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/atom+xml" title="Atom" href="$atomurl" />};
+			if (! $params{preview}) {
+				writefile($atomp, $config{destdir},
+					genfeed("atom", $atomurl, $desc, $params{destpage}, @list));
+				$toping{$params{destpage}}=1 unless $config{rebuild};
+				$feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/atom+xml" title="Atom" href="$atomurl" />};
+			}
 		}
 	}