X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d93aaed7919f0449d387aed6c6ee3aaff85a12eb..f00ccd0bf65e2a8d3d0ff4a3960e32c7aeba835a:/IkiWiki/Plugin/recentchangesdiff.pm?ds=inline diff --git a/IkiWiki/Plugin/recentchangesdiff.pm b/IkiWiki/Plugin/recentchangesdiff.pm index bd2826f76..eb358be67 100644 --- a/IkiWiki/Plugin/recentchangesdiff.pm +++ b/IkiWiki/Plugin/recentchangesdiff.pm @@ -3,25 +3,78 @@ package IkiWiki::Plugin::recentchangesdiff; use warnings; use strict; -use IkiWiki 2.00; +use IkiWiki 3.00; +use HTML::Entities; -sub import { #{{{ +my $maxlines=200; + +sub import { + add_underlay("javascript"); + hook(type => "getsetup", id => "recentchangesdiff", + call => \&getsetup); hook(type => "pagetemplate", id => "recentchangesdiff", call => \&pagetemplate); -} #}}} + hook(type => "format", id => "recentchangesdiff.pm", call => \&format); +} + +sub getsetup () { + return + plugin => { + safe => 1, + rebuild => 1, + }, +} -sub pagetemplate (@) { #{{{ +sub pagetemplate (@) { my %params=@_; my $template=$params{template}; if ($config{rcs} && exists $params{rev} && length $params{rev} && $template->query(name => "diff")) { - my $diff=IkiWiki::rcs_diff($params{rev}); - if (defined $diff && length $diff) { + my @lines=IkiWiki::rcs_diff($params{rev}, $maxlines+1); + if (@lines) { + my $diff; + my $trunc=0; + if (@lines > $maxlines) { + $diff=join("", @lines[0..($maxlines-1)]); + $trunc=1; + } + else { + $diff=join("", @lines); + } + if (length $diff > 102400) { + $diff=substr($diff, 0, 10240); + $trunc=1; + } + if ($trunc) { + $diff.="\n".gettext("(Diff truncated)"); + } + # escape html + $diff = encode_entities($diff); # escape links and preprocessor stuff - $diff =~ s/(?param(diff => $diff); } } -} #}}} +} + +sub format (@) { + my %params=@_; + + if (! ($params{content}=~s!^(]*>)!$1.include_javascript($params{page})!em)) { + # no tag, probably in preview mode + $params{content}=include_javascript(undef).$params{content}; + } + return $params{content}; +} + +# taken verbatim from toggle.pm +sub include_javascript ($) { + my $from=shift; + + return ''."\n". + ''; +} 1