X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/2ed033a4aac0d603c375294bdb19f5b74519f389..8b7389b426a7a9833b0bd40dca285b746d81b5a1:/IkiWiki/Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 093c25b45..59cec3646 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -65,7 +65,8 @@ sub genpage ($$) {
 	if (length $config{cgiurl}) {
 		$template->param(editurl => cgiurl(do => "edit", page => $page))
 			if IkiWiki->can("cgi_editpage");
-		$template->param(prefsurl => cgiurl(do => "prefs"));
+		$template->param(prefsurl => cgiurl(do => "prefs"))
+			if exists $hooks{auth};
 		$actions++;
 	}
 		
@@ -76,8 +77,8 @@ sub genpage ($$) {
 		$actions++;
 	}
 	if ($config{discussion}) {
-		my $discussionlink=gettext("discussion");
-		if ($page !~ /.*\/\Q$discussionlink\E$/i &&
+		my $discussionlink=lc(gettext("Discussion"));
+		if ($page !~ /.*\/\Q$discussionlink\E$/ &&
 		   (length $config{cgiurl} ||
 		    exists $links{$page."/".$discussionlink})) {
 			$template->param(discussionlink => htmllink($page, $page, gettext("Discussion"), noimageinline => 1, forcesubpage => 1));
@@ -146,7 +147,7 @@ sub scan ($) {
 		if ($config{discussion}) {
 			# Discussion links are a special case since they're
 			# not in the text of the page, but on its template.
-			$links{$page}=[ $page."/".gettext("discussion") ];
+			$links{$page}=[ $page."/".lc(gettext("Discussion")) ];
 		}
 		else {
 			$links{$page}=[];
@@ -245,7 +246,7 @@ sub prune ($) {
 	}
 }
 
-sub refresh () {
+sub srcdir_check () {
 	# security check, avoid following symlinks in the srcdir path by default
 	my $test=$config{srcdir};
 	while (length $test) {
@@ -257,11 +258,10 @@ sub refresh () {
 		}
 	}
 	
-	run_hooks(refresh => sub { shift->() });
+}
 
-	# find existing pages
-	my %exists;
-	my @files;
+sub find_src_files () {
+	my (@files, %pages);
 	eval q{use File::Find};
 	error($@) if $@;
 	find({
@@ -280,10 +280,10 @@ sub refresh () {
 					$f=~s/^\Q$config{srcdir}\E\/?//;
 					push @files, $f;
 					my $pagename = pagename($f);
-					if ($exists{$pagename}) {
+					if ($pages{$pagename}) {
 						debug(sprintf(gettext("%s has multiple possible source pages"), $pagename));
 					}
-					$exists{$pagename}=1;
+					$pages{$pagename}=1;
 				}
 			}
 		},
@@ -309,9 +309,9 @@ sub refresh () {
 						if (! -l "$config{srcdir}/$f" && 
 						    ! -e _) {
 						    	my $page=pagename($f);
-							if (! $exists{$page}) {
+							if (! $pages{$page}) {
 								push @files, $f;
-								$exists{$page}=1;
+								$pages{$page}=1;
 							}
 						}
 					}
@@ -320,9 +320,19 @@ sub refresh () {
 		}, $dir);
 	};
 
+	# Returns a list of all source files found, and a hash of 
+	# the corresponding page names.
+	return \@files, \%pages;
+}
+
+sub refresh () {
+	srcdir_check();
+	run_hooks(refresh => sub { shift->() });
+	my ($files, $exists)=find_src_files();
+
 	my (%rendered, @add, @del, @internal);
 	# check for added or removed pages
-	foreach my $file (@files) {
+	foreach my $file (@$files) {
 		my $page=pagename($file);
 		if (exists $pagesources{$page} && $pagesources{$page} ne $file) {
 			# the page has changed its type
@@ -352,7 +362,7 @@ sub refresh () {
 		}
 	}
 	foreach my $page (keys %pagemtime) {
-		if (! $exists{$page}) {
+		if (! $exists->{$page}) {
 			if (isinternal($page)) {
 				push @internal, $pagesources{$page};
 			}
@@ -376,7 +386,7 @@ sub refresh () {
 
 	# find changed and new files
 	my @needsbuild;
-	foreach my $file (@files) {
+	foreach my $file (@$files) {
 		my $page=pagename($file);
 		my ($srcfile, @stat)=srcfile_stat($file);
 		if (! exists $pagemtime{$page} ||
@@ -434,7 +444,7 @@ sub refresh () {
 		my @changed=(keys %rendered, @del);
 
 		# rebuild dependant pages
-		foreach my $f (@files) {
+		foreach my $f (@$files) {
 			next if $rendered{$f};
 			my $p=pagename($f);
 			if (exists $depends{$p}) {