X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/587e0c3d21dfbde052e0fd71a7ed0e33e09e757f..da5d29f95f6e693e8c14be1b896cf25cf4fdb3c0:/IkiWiki/Render.pm?ds=inline

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 0889fed62..5b72b6de1 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -61,6 +61,10 @@ sub backlinks ($) {
 sub genpage ($$) {
 	my $page=shift;
 	my $content=shift;
+	
+	run_hooks(postscan => sub {
+		shift->(page => $page, content => $content);
+	});
 
 	my $templatefile;
 	run_hooks(templatefile => sub {
@@ -74,11 +78,14 @@ sub genpage ($$) {
 	my $actions=0;
 
 	if (length $config{cgiurl}) {
-		$template->param(editurl => cgiurl(do => "edit", page => $page))
-			if IkiWiki->can("cgi_editpage");
-		$template->param(prefsurl => cgiurl(do => "prefs"))
-			if exists $hooks{auth};
-		$actions++;
+		if (IkiWiki->can("cgi_editpage")) {
+			$template->param(editurl => cgiurl(do => "edit", page => $page));
+			$actions++;
+		}
+		if (exists $hooks{auth}) {
+			$template->param(prefsurl => cgiurl(do => "prefs"));
+			$actions++;
+		}
 	}
 		
 	if (defined $config{historyurl} && length $config{historyurl}) {
@@ -88,7 +95,7 @@ sub genpage ($$) {
 		$actions++;
 	}
 	if ($config{discussion}) {
-		if ($page !~ /.*\/\Q$config{discussionpage}\E$/ &&
+		if ($page !~ /.*\/\Q$config{discussionpage}\E$/i &&
 		   (length $config{cgiurl} ||
 		    exists $links{$page."/".$config{discussionpage}})) {
 			$template->param(discussionlink => htmllink($page, $page, $config{discussionpage}, noimageinline => 1, forcesubpage => 1));
@@ -130,10 +137,6 @@ sub genpage ($$) {
 	
 	$content=$template->output;
 	
-	run_hooks(postscan => sub {
-		shift->(page => $page, content => $content);
-	});
-
 	run_hooks(format => sub {
 		$content=shift->(
 			page => $page,
@@ -277,6 +280,27 @@ sub srcdir_check () {
 	
 }
 
+sub verify_src_file ($$) {
+	my $file=decode_utf8(shift);
+	my $dir=shift;
+
+	return if -l $file || -d _;
+	$file=~s/^\Q$dir\E\/?//;
+	return if ! length $file;
+	my $page = pagename($file);
+	if (! exists $pagesources{$page} &&
+		file_pruned($file)) {
+		$File::Find::prune=1;
+		return;
+	}
+
+	my ($file_untainted) = $file =~ /$config{wiki_file_regexp}/; # untaint
+	if (! defined $file_untainted) {
+		warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
+	}
+	return ($file_untainted, $page);
+}
+
 sub find_src_files () {
 	my @files;
 	my %pages;
@@ -285,22 +309,9 @@ sub find_src_files () {
 	find({
 		no_chdir => 1,
 		wanted => sub {
-			my $file=decode_utf8($_);
-			$file=~s/^\Q$config{srcdir}\E\/?//;
-			return if -l $_ || -d _ || ! length $file;
-			my $page = pagename($file);
-			if (! exists $pagesources{$page} &&
-			    file_pruned($file)) {
-				$File::Find::prune=1;
-				return;
-			}
-
-			my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
-			if (! defined $f) {
-				warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
-			}
-			else {
-				push @files, $f;
+			my ($file, $page) = verify_src_file($_, $config{srcdir});
+			if (defined $file) {
+				push @files, $file;
 				if ($pages{$page}) {
 					debug(sprintf(gettext("%s has multiple possible source pages"), $page));
 				}
@@ -312,27 +323,14 @@ sub find_src_files () {
 		find({
 			no_chdir => 1,
 			wanted => sub {
-				my $file=decode_utf8($_);
-				$file=~s/^\Q$dir\E\/?//;
-				return if -l $_ || -d _ || ! length $file;
-				my $page=pagename($file);
-				if (! exists $pagesources{$page} &&
-				    file_pruned($file)) {
-					$File::Find::prune=1;
-					return;
-				}
-
-				my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
-				if (! defined $f) {
-					warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
-				}
-				else {
+				my ($file, $page) = verify_src_file($_, $dir);
+				if (defined $file) {
 					# avoid underlaydir override
 					# attacks; see security.mdwn
-					if (! -l "$config{srcdir}/$f" && 
+					if (! -l "$config{srcdir}/$file" &&
 					    ! -e _) {
 						if (! $pages{$page}) {
-							push @files, $f;
+							push @files, $file;
 							$pages{$page}=1;
 						}
 					}
@@ -392,27 +390,41 @@ sub find_del_files ($) {
 				push @internal_del, $pagesources{$page};
 			}
 			else {
-				debug(sprintf(gettext("removing old page %s"), $page));
 				push @del, $pagesources{$page};
 			}
+			$dellinks{$page}= $links{$page};
 			$links{$page}=[];
+			$delrenderedfiles{$page}= $renderedfiles{$page};
 			$renderedfiles{$page}=[];
 			$pagemtime{$page}=0;
-			foreach my $old (@{$oldrenderedfiles{$page}}) {
-				prune($config{destdir}."/".$old);
-			}
-			delete $pagesources{$page};
-			foreach my $source (keys %destsources) {
-				if ($destsources{$source} eq $page) {
-					delete $destsources{$source};
-				}
-			}
 		}
 	}
 
 	return \@del, \@internal_del;
 }
 
+sub remove_del (@) {
+	foreach my $file (@_) {
+		my $page=pagename($file);
+		if (! isinternal($page)) {
+			debug(sprintf(gettext("removing old page %s"), $page));
+		}
+	
+		foreach my $old (@{$oldrenderedfiles{$page}}) {
+			prune($config{destdir}."/".$old);
+		}
+
+		foreach my $source (keys %destsources) {
+			if ($destsources{$source} eq $page) {
+				delete $destsources{$source};
+			}
+		}
+	
+		delete $pagecase{lc $page};
+		delete $pagesources{$page};
+	}
+}
+
 sub find_changed ($) {
 	my $files=shift;
 	my @changed;
@@ -632,7 +644,30 @@ sub refresh () {
 		scan($file);
 	}
 
+	my %del_hash = map {$_, 1} @$del;
+	while (my $autofile = shift (@autofiles)) {
+		my $page=pagename($autofile);
+    if (exists $del_hash{$page}) {
+			$links{$page}= $dellinks{$page};
+			$renderedfiles{$page}= $delrenderedfiles{$page};
+			delete $del_hash{$page};
+		}
+		if ($pages->{$page}) {
+			debug(sprintf(gettext("%s has multiple possible source pages"), $page));
+		}
+		$pages->{$page}=1;
+
+		push @{$files}, $autofile;
+		push @{$new}, $autofile if find_new_files([$autofile]);
+		push @{$changed}, $autofile if find_changed([$autofile]);
+
+		scan($autofile);
+	}
+	$del = [keys %del_hash];
+
 	calculate_links();
+	
+	remove_del(@$del, @$internal_del);
 
 	foreach my $file (@$changed) {
 		render($file, sprintf(gettext("building %s"), $file));