X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/bc49e284ac96ca0058bfe4b026d23022d5d3f659..a7545978c76902076b42b774938e6f60b96aa396:/IkiWiki/Plugin/recentchanges.pm
diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 9dad0af5e..fa851e466 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -3,20 +3,48 @@ package IkiWiki::Plugin::recentchanges;
use warnings;
use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
+use Encode;
+use HTML::Entities;
-sub import { #{{{
+sub import {
+ hook(type => "getsetup", id => "recentchanges", call => \&getsetup);
hook(type => "checkconfig", id => "recentchanges", call => \&checkconfig);
hook(type => "refresh", id => "recentchanges", call => \&refresh);
+ hook(type => "pagetemplate", id => "recentchanges", call => \&pagetemplate);
hook(type => "htmlize", id => "_change", call => \&htmlize);
-} #}}}
-
-sub checkconfig () { #{{{
+ # Load goto to fix up links from recentchanges
+ IkiWiki::loadplugin("goto");
+}
+
+sub getsetup () {
+ return
+ plugin => {
+ safe => 1,
+ rebuild => 1,
+ },
+ recentchangespage => {
+ type => "string",
+ example => "recentchanges",
+ description => "name of the recentchanges page",
+ safe => 1,
+ rebuild => 1,
+ },
+ recentchangesnum => {
+ type => "integer",
+ example => 100,
+ description => "number of changes to track",
+ safe => 1,
+ rebuild => 0,
+ },
+}
+
+sub checkconfig () {
$config{recentchangespage}='recentchanges' unless defined $config{recentchangespage};
$config{recentchangesnum}=100 unless defined $config{recentchangesnum};
-} #}}}
+}
-sub refresh ($) { #{{{
+sub refresh ($) {
my %seen;
# add new changes
@@ -26,22 +54,36 @@ sub refresh ($) { #{{{
# delete old and excess changes
foreach my $page (keys %pagesources) {
- if ($page=~/^\Q$config{recentchangespage}\E\/change_/ && ! $seen{$page}) {
+ if ($pagesources{$page} =~ /\._change$/ && ! $seen{$page}) {
unlink($config{srcdir}.'/'.$pagesources{$page});
}
}
-} #}}}
+}
+
+# Enable the recentchanges link on wiki pages.
+sub pagetemplate (@) {
+ my %params=@_;
+ my $template=$params{template};
+ my $page=$params{page};
+
+ if (defined $config{recentchangespage} && $config{rcs} &&
+ $page ne $config{recentchangespage} &&
+ $template->query(name => "recentchangesurl")) {
+ $template->param(recentchangesurl => urlto($config{recentchangespage}, $page));
+ $template->param(have_actions => 1);
+ }
+}
# Pages with extension _change have plain html markup, pass through.
-sub htmlize (@) { #{{{
+sub htmlize (@) {
my %params=@_;
return $params{content};
-} #}}}
+}
-sub store ($$$) { #{{{
+sub store ($$$) {
my $change=shift;
- my $page="$config{recentchangespage}/change_".IkiWiki::titlepage($change->{rev});
+ my $page="$config{recentchangespage}/change_".titlepage($change->{rev});
# Optimisation to avoid re-writing pages. Assumes commits never
# change (or that any changes are not important).
@@ -52,14 +94,21 @@ sub store ($$$) { #{{{
delete @{$change->{pages}}[10 .. @{$change->{pages}}] if $is_excess;
$change->{pages} = [
map {
- if (length $config{url}) {
- $_->{link} = "{page},"")."\">".
- IkiWiki::pagetitle($_->{page})."";
+ if (length $config{cgiurl}) {
+ $_->{link} = " "goto",
+ page => $_->{page}
+ ).
+ "\" rel=\"nofollow\">".
+ pagetitle($_->{page}).
+ ""
}
else {
- $_->{link} = IkiWiki::pagetitle($_->{page});
+ $_->{link} = pagetitle($_->{page});
}
+ $_->{baseurl}="$config{url}/" if length $config{url};
+
$_;
} @{$change->{pages}}
];
@@ -67,22 +116,25 @@ sub store ($$$) { #{{{
# See if the committer is an openid.
$change->{author}=$change->{user};
- my $oiduser=IkiWiki::openiduser($change->{user});
+ my $oiduser=eval { IkiWiki::openiduser($change->{user}) };
if (defined $oiduser) {
$change->{authorurl}=$change->{user};
$change->{user}=$oiduser;
}
- elsif (length $config{url}) {
- $change->{authorurl}="$config{url}/".
- (length $config{userdir} ? "$config{userdir}/" : "").
- $change->{user};
+ elsif (length $config{cgiurl}) {
+ $change->{authorurl} = IkiWiki::cgiurl(
+ do => "goto",
+ page => (length $config{userdir} ? "$config{userdir}/" : "").$change->{author},
+ );
}
- # escape wikilinks and preprocessor stuff in commit messages
if (ref $change->{message}) {
foreach my $field (@{$change->{message}}) {
if (exists $field->{line}) {
- $field->{line} =~ s/(?{line} = encode_entities($field->{line});
+ # escape links and preprocessor stuff
+ $field->{line} = encode_entities($field->{line}, '\[\]');
}
}
}
@@ -94,9 +146,13 @@ sub store ($$$) { #{{{
commitdate => displaytime($change->{when}, "%X %x"),
wikiname => $config{wikiname},
);
- $template->param(baseurl => "$config{url}/") if length $config{url};
+
+ $template->param(permalink => "$config{url}/$config{recentchangespage}/#change-".titlepage($change->{rev}))
+ if exists $config{url};
+
IkiWiki::run_hooks(pagetemplate => sub {
- shift->(page => $page, destpage => $page, template => $template);
+ shift->(page => $page, destpage => $page,
+ template => $template, rev => $change->{rev});
});
my $file=$page."._change";
@@ -104,12 +160,6 @@ sub store ($$$) { #{{{
utime $change->{when}, $change->{when}, "$config{srcdir}/$file";
return $page;
-} #}}}
-
-sub updatechanges ($$) { #{{{
- my $subdir=shift;
- my @changes=@{shift()};
-
-} #}}}
+}
1