getsource: don't allow getting the source of an attachment

[git.ikiwiki.info.git] / IkiWiki / Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 8e4c8af71f8a2df4c0f59f0971309f76b040cd69..bed9cb777c6505195218d00d09842d29a85785bd 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -7,8 +7,8 @@ use strict;
 use IkiWiki;
 use Encode;
 
-our %backlinks=();
-our $backlinks_calculated=0;
+my %backlinks;
+my $backlinks_calculated=0;
 
 sub calculate_backlinks () {
        return if $backlinks_calculated;
@@ -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,7 +77,7 @@ sub genpage ($$) {
                $actions++;
        }
        if ($config{discussion}) {
-               my $discussionlink=gettext("discussion");
+               my $discussionlink=lc(gettext("Discussion"));
                if ($page !~ /.*\/\Q$discussionlink\E$/ &&
                   (length $config{cgiurl} ||
                    exists $links{$page."/".$discussionlink})) {
@@ -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} ||
@@ -402,7 +412,7 @@ sub refresh () {
        }
        calculate_backlinks();
        foreach my $file (@needsbuild) {
-               debug(sprintf(gettext("rendering %s"), $file));
+               debug(sprintf(gettext("building %s"), $file));
                render($file);
                $rendered{$file}=1;
        }
@@ -423,7 +433,7 @@ sub refresh () {
                        foreach my $page (keys %{$backlinks{$p}}) {
                                my $file=$pagesources{$page};
                                next if $rendered{$file};
-                               debug(sprintf(gettext("rendering %s, which links to %s"), $file, $p));
+                               debug(sprintf(gettext("building %s, which links to %s"), $file, $p));
                                render($file);
                                $rendered{$file}=1;
                        }
@@ -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}) {
@@ -444,7 +454,7 @@ sub refresh () {
                                        next if $f eq $file;
                                        my $page=pagename($file);
                                        if (pagespec_match($page, $depends{$p}, location => $p)) {
-                                               debug(sprintf(gettext("rendering %s, which depends on %s"), $f, $page));
+                                               debug(sprintf(gettext("building %s, which depends on %s"), $f, $page));
                                                render($f);
                                                $rendered{$f}=1;
                                                last;
@@ -483,7 +493,7 @@ sub refresh () {
                        my $linkfile=$pagesources{$link};
                        if (defined $linkfile) {
                                next if $rendered{$linkfile};
-                               debug(sprintf(gettext("rendering %s, to update its backlinks"), $linkfile));
+                               debug(sprintf(gettext("building %s, to update its backlinks"), $linkfile));
                                render($linkfile);
                                $rendered{$linkfile}=1;
                        }
@@ -495,7 +505,7 @@ sub refresh () {
                my $page=pagename($src);
                foreach my $file (@{$oldrenderedfiles{$page}}) {
                        if (! grep { $_ eq $file } @{$renderedfiles{$page}}) {
-                               debug(sprintf(gettext("removing %s, no longer rendered by %s"), $file, $page));
+                               debug(sprintf(gettext("removing %s, no longer built by %s"), $file, $page));
                                prune($config{destdir}."/".$file);
                        }
                }
@@ -519,7 +529,7 @@ sub commandline_render () {
        $file=~s/\Q$config{srcdir}\E\/?//;
 
        my $type=pagetype($file);
-       die sprintf(gettext("ikiwiki: cannot render %s"), $srcfile)."\n" unless defined $type;
+       die sprintf(gettext("ikiwiki: cannot build %s"), $srcfile)."\n" unless defined $type;
        my $content=readfile($srcfile);
        my $page=pagename($file);
        $pagesources{$page}=$file;