X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c490ad5ad81c01f2b7233496a407b845d4a35185..0b977fa22cabf8e1050857412123015c07c30c19:/IkiWiki/Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index e77379a65..35d663a7a 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -44,11 +44,7 @@ sub backlinks ($) { #{{{
 			       
 		push @links, { url => $href, page => pagetitle($p_trimmed) };
 	}
-	@links = sort { $a->{page} cmp $b->{page} } @links;
-
-	return \@links, [] if @links <= $config{numbacklinks} || ! $config{numbacklinks};
-	return [@links[0..$config{numbacklinks}-1]],
-	       [@links[$config{numbacklinks}..$#links]];
+	return @links;
 } #}}}
 
 sub parentlinks ($) { #{{{
@@ -73,7 +69,15 @@ sub genpage ($$$) { #{{{
 	my $content=shift;
 	my $mtime=shift;
 
-	my $template=template("page.tmpl", blind_cache => 1);
+	my $templatefile;
+	run_hooks(templatefile => sub {
+		return if defined $templatefile;
+		my $file=shift->(page => $page);
+		if (defined $file && defined template_file($file)) {
+			$templatefile=$file;
+		}
+	});
+	my $template=template(defined $templatefile ? $templatefile : 'page.tmpl', blind_cache => 1);
 	my $actions=0;
 
 	if (length $config{cgiurl}) {
@@ -105,7 +109,16 @@ sub genpage ($$$) { #{{{
 		$template->param(have_actions => 1);
 	}
 
-	my ($backlinks, $more_backlinks)=backlinks($page);
+	my @backlinks=sort { $a->{page} cmp $b->{page} } backlinks($page);
+	my ($backlinks, $more_backlinks);
+	if (@backlinks <= $config{numbacklinks} || ! $config{numbacklinks}) {
+		$backlinks=\@backlinks;
+		$more_backlinks=[];
+	}
+	else {
+		$backlinks=[@backlinks[0..$config{numbacklinks}-1]];
+		$more_backlinks=[@backlinks[$config{numbacklinks}..$#backlinks]];
+	}
 
 	$template->param(
 		title => $page eq 'index' 
@@ -154,7 +167,7 @@ sub scan ($) { #{{{
 
 		# Always needs to be done, since filters might add links
 		# to the content.
-		$content=filter($page, $content);
+		$content=filter($page, $page, $content);
 
 		my @links;
 		while ($content =~ /(?<!\\)$config{wiki_link_regexp}/g) {
@@ -181,15 +194,15 @@ sub render ($) { #{{{
 	my $type=pagetype($file);
 	my $srcfile=srcfile($file);
 	if (defined $type) {
-		my $content=readfile($srcfile);
 		my $page=pagename($file);
 		delete $depends{$page};
 		will_render($page, htmlpage($page), 1);
 		
-		$content=filter($page, $content);
-		$content=preprocess($page, $page, $content);
-		$content=linkify($page, $page, $content);
-		$content=htmlize($page, $type, $content);
+		my $content=htmlize($page, $type,
+			linkify($page, $page,
+			preprocess($page, $page,
+			filter($page, $page,
+			readfile($srcfile)))));
 		
 		writefile(htmlpage($page), $config{destdir},
 			genpage($page, $content, mtime($srcfile)));
@@ -257,34 +270,37 @@ sub refresh () { #{{{
 			}
 		},
 	}, $config{srcdir});
-	find({
-		no_chdir => 1,
-		wanted => sub {
-			$_=decode_utf8($_);
-			if (file_pruned($_, $config{underlaydir})) {
-				$File::Find::prune=1;
-			}
-			elsif (! -d $_ && ! -l $_) {
-				my ($f)=/$config{wiki_file_regexp}/; # untaint
-				if (! defined $f) {
-					warn(sprintf(gettext("skipping bad filename %s"), $_)."\n");
+	foreach my $dir (@{$config{underlaydirs}}, $config{underlaydir}) {
+		find({
+			no_chdir => 1,
+			wanted => sub {
+				$_=decode_utf8($_);
+				if (file_pruned($_, $dir)) {
+					$File::Find::prune=1;
 				}
-				else {
-					# Don't add pages that are in the
-					# srcdir.
-					$f=~s/^\Q$config{underlaydir}\E\/?//;
-					if (! -e "$config{srcdir}/$f" && 
-					    ! -l "$config{srcdir}/$f") {
-					    	my $page=pagename($f);
-						if (! $exists{$page}) {
-							push @files, $f;
-							$exists{$page}=1;
+				elsif (! -d $_ && ! -l $_) {
+					my ($f)=/$config{wiki_file_regexp}/; # untaint
+					if (! defined $f) {
+						warn(sprintf(gettext("skipping bad filename %s"), $_)."\n");
+					}
+					else {
+						$f=~s/^\Q$dir\E\/?//;
+						# avoid underlaydir
+						# override attacks; see
+						# security.mdwn
+						if (! -e "$config{srcdir}/$f" && 
+						    ! -l "$config{srcdir}/$f") {
+						    	my $page=pagename($f);
+							if (! $exists{$page}) {
+								push @files, $f;
+								$exists{$page}=1;
+							}
 						}
 					}
 				}
-			}
-		},
-	}, $config{underlaydir});
+			},
+		}, $dir);
+	};
 
 	my %rendered;
 
@@ -315,11 +331,16 @@ sub refresh () { #{{{
 			prune($config{destdir}."/".$_)
 				foreach @{$oldrenderedfiles{$page}};
 			delete $pagesources{$page};
+			foreach (keys %destsources) {
+				if ($destsources{$_} eq $page) {
+					delete $destsources{$_};
+				}
+			}
 		}
 	}
 
-	# scan changed and new files
-	my @changed;
+	# find changed and new files
+	my @needsbuild;
 	foreach my $file (@files) {
 		my $page=pagename($file);
 		
@@ -327,16 +348,19 @@ sub refresh () { #{{{
 		if (! exists $pagemtime{$page} ||
 		    $mtime > $pagemtime{$page} ||
 	    	    $forcerebuild{$page}) {
-		    	debug(sprintf(gettext("scanning %s"), $file));
-		    	$pagemtime{$page}=$mtime;
-			push @changed, $file;
-			scan($file);
+			$pagemtime{$page}=$mtime;
+			push @needsbuild, $file;
 		}
 	}
-	calculate_backlinks();
+	run_hooks(needsbuild => sub { shift->(\@needsbuild) });
 
-	# render changed and new pages
-	foreach my $file (@changed) {
+	# scan and render files
+	foreach my $file (@needsbuild) {
+		debug(sprintf(gettext("scanning %s"), $file));
+		scan($file);
+	}
+	calculate_backlinks();
+	foreach my $file (@needsbuild) {
 		debug(sprintf(gettext("rendering %s"), $file));
 		render($file);
 		$rendered{$file}=1;
@@ -365,7 +389,7 @@ sub refresh () { #{{{
 				foreach my $file (keys %rendered, @del) {
 					next if $f eq $file;
 					my $page=pagename($file);
-					if (pagespec_match($page, $depends{$p}, $p)) {
+					if (pagespec_match($page, $depends{$p}, location => $p)) {
 						debug(sprintf(gettext("rendering %s, which depends on %s"), $f, $page));
 						render($f);
 						$rendered{$f}=1;
@@ -446,7 +470,7 @@ sub commandline_render () { #{{{
 	my $content=readfile($srcfile);
 	my $page=pagename($file);
 	$pagesources{$page}=$file;
-	$content=filter($page, $content);
+	$content=filter($page, $page, $content);
 	$content=preprocess($page, $page, $content);
 	$content=linkify($page, $page, $content);
 	$content=htmlize($page, $type, $content);