* git: Correct display of multiline commit messages in recentchanges.

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

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 990b803de16c0dbc4b96542f83cf17c094b73cd8..047ab8212f16591bdcf3daf03d36c7436f4cb819 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -30,10 +30,9 @@ sub backlinks ($) { #{{{
        calculate_backlinks();
 
        my @links;
        calculate_backlinks();
 
        my @links;

-       return unless $backlinks{$page};

        foreach my $p (keys %{$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;
                # 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) };
        }
                               
                push @links, { url => $href, page => pagetitle($p_trimmed) };
        }

-
-       return sort { $a->{page} cmp $b->{page} } @links;
+       return @links;

 } #}}}
 
 sub parentlinks ($) { #{{{
 } #}}}
 
 sub parentlinks ($) { #{{{


@@ -55,27 +53,30 @@ sub parentlinks ($) { #{{{
        my @ret;
        my $pagelink="";
        my $path="";
        my @ret;
        my $pagelink="";
        my $path="";

-       my $skip=1;
+       my $title=$config{wikiname};
+       

        return if $page eq 'index'; # toplevel
        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;
 } #}}}
 
        return @ret;
 } #}}}
 

-sub genpage ($$$) { #{{{
+sub genpage ($$) { #{{{

        my $page=shift;
        my $content=shift;
        my $page=shift;
        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}) {
        my $actions=0;
 
        if (length $config{cgiurl}) {


@@ -107,6 +108,17 @@ sub genpage ($$$) { #{{{
                $template->param(have_actions => 1);
        }
 
                $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} 
        $template->param(
                title => $page eq 'index' 
                        ? $config{wikiname} 


@@ -114,8 +126,9 @@ sub genpage ($$$) { #{{{
                wikiname => $config{wikiname},
                parentlinks => [parentlinks($page)],
                content => $content,
                wikiname => $config{wikiname},
                parentlinks => [parentlinks($page)],
                content => $content,

-               backlinks => [backlinks($page)],
-               mtime => displaytime($mtime),
+               backlinks => $backlinks,
+               more_backlinks => $more_backlinks,
+               mtime => displaytime($pagemtime{$page}),

                baseurl => baseurl($page),
        );
 
                baseurl => baseurl($page),
        );
 


@@ -153,7 +166,7 @@ sub scan ($) { #{{{
 
                # Always needs to be done, since filters might add links
                # to the content.
 
                # 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) {
 
                my @links;
                while ($content =~ /(?<!\\)$config{wiki_link_regexp}/g) {


@@ -180,19 +193,19 @@ sub render ($) { #{{{
        my $type=pagetype($file);
        my $srcfile=srcfile($file);
        if (defined $type) {
        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);
                
                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;
+               my $output=htmlpage($page);
+               writefile($output, $config{destdir}, genpage($page, $content));
+               utime($pagemtime{$page}, $pagemtime{$page}, $config{destdir}."/".$output);

        }
        else {
                my $srcfd=readfile($srcfile, 1, 1);
        }
        else {
                my $srcfd=readfile($srcfile, 1, 1);


@@ -218,7 +231,7 @@ sub render ($) { #{{{
                                }
                        }
                });
                                }
                        }
                });

-               $oldpagemtime{$file}=time;
+               utime($pagemtime{$file}, $pagemtime{$file}, $config{destdir}."/".$file);

        }
 } #}}}
 
        }
 } #}}}
 


@@ -233,6 +246,17 @@ sub prune ($) { #{{{
 } #}}}
 
 sub refresh () { #{{{
 } #}}}
 
 sub refresh () { #{{{

+       # security check, avoid following symlinks in the srcdir path
+       my $test=$config{srcdir};
+       while (length $test) {
+               if (-l $test) {
+                       error("symlink found in srcdir path ($test)");
+               }
+               unless ($test=~s/\/+$//) {
+                       $test=dirname($test);
+               }
+       }
+

        # find existing pages
        my %exists;
        my @files;
        # find existing pages
        my %exists;
        my @files;


@@ -258,34 +282,37 @@ sub refresh () { #{{{
                        }
                },
        }, $config{srcdir});
                        }
                },
        }, $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;
 
 
        my %rendered;
 


@@ -294,7 +321,7 @@ sub refresh () { #{{{
        foreach my $file (@files) {
                my $page=pagename($file);
                $pagesources{$page}=$file;
        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") {
                        push @add, $file;
                        $pagecase{lc $page}=$page;
                        if ($config{getctime} && -e "$config{srcdir}/$file") {


@@ -306,36 +333,46 @@ sub refresh () { #{{{
                }
        }
        my @del;
                }
        }
        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}=[];
                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};
                        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);
                
        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}) {
                    $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;
                debug(sprintf(gettext("rendering %s"), $file));
                render($file);
                $rendered{$file}=1;


@@ -364,7 +401,7 @@ sub refresh () { #{{{
                                foreach my $file (keys %rendered, @del) {
                                        next if $f eq $file;
                                        my $page=pagename($file);
                                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;
                                                debug(sprintf(gettext("rendering %s, which depends on %s"), $f, $page));
                                                render($f);
                                                $rendered{$f}=1;


@@ -445,12 +482,13 @@ sub commandline_render () { #{{{
        my $content=readfile($srcfile);
        my $page=pagename($file);
        $pagesources{$page}=$file;
        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);
        $content=preprocess($page, $page, $content);
        $content=linkify($page, $page, $content);
        $content=htmlize($page, $type, $content);

+       $pagemtime{$page}=mtime($srcfile);

 
 

-       print genpage($page, $content, mtime($srcfile));
+       print genpage($page, $content);

        exit 0;
 } #}}}
 
        exit 0;
 } #}}}