X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d4c61b72813b880d86b316770f2e3819a6428202..c3b0e5fd035d82472408fd75b8f604ae95a88fe0:/IkiWiki/Render.pm?ds=sidebyside
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index cbba28251..35d663a7a 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -30,10 +30,9 @@ sub backlinks ($) { #{{{
calculate_backlinks();
my @links;
- return unless $backlinks{$page};
foreach my $p (keys %{$backlinks{$page}}) {
- my $href=abs2rel(htmlpage($p), dirname($page));
-
+ my $href=urlto($p, $page);
+
# Trim common dir prefixes from both pages.
my $p_trimmed=$p;
my $page_trimmed=$page;
@@ -45,8 +44,7 @@ sub backlinks ($) { #{{{
push @links, { url => $href, page => pagetitle($p_trimmed) };
}
-
- return sort { $a->{page} cmp $b->{page} } @links;
+ return @links;
} #}}}
sub parentlinks ($) { #{{{
@@ -55,18 +53,14 @@ sub parentlinks ($) { #{{{
my @ret;
my $pagelink="";
my $path="";
- my $skip=1;
+ my $title=$config{wikiname};
+
return if $page eq 'index'; # toplevel
- foreach my $dir (reverse split("/", $page)) {
- if (! $skip) {
- $path.="../";
- unshift @ret, { url => $path.htmlpage($dir), page => pagetitle($dir) };
- }
- else {
- $skip=0;
- }
+ foreach my $dir (split("/", $page)) {
+ push @ret, { url => urlto($path, $page), page => $title };
+ $path.="/".$dir;
+ $title=pagetitle($dir);
}
- unshift @ret, { url => length $path ? $path : ".", page => $config{wikiname} };
return @ret;
} #}}}
@@ -75,11 +69,19 @@ 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}) {
- $template->param(editurl => cgiurl(do => "edit", page => $page));
+ $template->param(editurl => cgiurl(do => "edit", page => pagetitle($page, 1)));
$template->param(prefsurl => cgiurl(do => "prefs"));
if ($config{rcs}) {
$template->param(recentchangesurl => cgiurl(do => "recentchanges"));
@@ -98,7 +100,7 @@ sub genpage ($$$) { #{{{
if ($page !~ /.*\/\Q$discussionlink\E$/ &&
(length $config{cgiurl} ||
exists $links{$page."/".$discussionlink})) {
- $template->param(discussionlink => htmllink($page, $page, gettext("Discussion"), 1, 1));
+ $template->param(discussionlink => htmllink($page, $page, gettext("Discussion"), noimageinline => 1, forcesubpage => 1));
$actions++;
}
}
@@ -107,6 +109,17 @@ sub genpage ($$$) { #{{{
$template->param(have_actions => 1);
}
+ 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'
? $config{wikiname}
@@ -114,7 +127,8 @@ sub genpage ($$$) { #{{{
wikiname => $config{wikiname},
parentlinks => [parentlinks($page)],
content => $content,
- backlinks => [backlinks($page)],
+ backlinks => $backlinks,
+ more_backlinks => $more_backlinks,
mtime => displaytime($mtime),
baseurl => baseurl($page),
);
@@ -153,11 +167,11 @@ 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) {
- push @links, titlepage($2);
+ push @links, linkpage($2);
}
if ($config{discussion}) {
# Discussion links are a special case since they're
@@ -180,19 +194,18 @@ 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)));
- $oldpagemtime{$page}=time;
}
else {
my $srcfd=readfile($srcfile, 1, 1);
@@ -218,7 +231,6 @@ sub render ($) { #{{{
}
}
});
- $oldpagemtime{$file}=time;
}
} #}}}
@@ -258,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;
@@ -294,7 +309,7 @@ sub refresh () { #{{{
foreach my $file (@files) {
my $page=pagename($file);
$pagesources{$page}=$file;
- if (! $oldpagemtime{$page}) {
+ if (! $pagemtime{$page}) {
push @add, $file;
$pagecase{lc $page}=$page;
if ($config{getctime} && -e "$config{srcdir}/$file") {
@@ -306,36 +321,46 @@ sub refresh () { #{{{
}
}
my @del;
- foreach my $page (keys %oldpagemtime) {
+ foreach my $page (keys %pagemtime) {
if (! $exists{$page}) {
debug(sprintf(gettext("removing old page %s"), $page));
push @del, $pagesources{$page};
$links{$page}=[];
$renderedfiles{$page}=[];
- $oldpagemtime{$page}=0;
+ $pagemtime{$page}=0;
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);
- if (! exists $oldpagemtime{$page} ||
- mtime(srcfile($file)) > $oldpagemtime{$page} ||
+ my $mtime=mtime(srcfile($file));
+ if (! exists $pagemtime{$page} ||
+ $mtime > $pagemtime{$page} ||
$forcerebuild{$page}) {
- debug(sprintf(gettext("scanning %s"), $file));
- 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;
@@ -364,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;
@@ -445,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);