update

[git.ikiwiki.info.git] / IkiWiki / Plugin / recentchanges.pm

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 337fb7ac55146ba60ef7e618d84371a58a61bd67..5c7b71aaa64bd02e310b6c5428224ce68ba0679a 100644 (file)
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -3,21 +3,48 @@ package IkiWiki::Plugin::recentchanges;
 
 use warnings;
 use strict;
 
 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 => "checkconfig", id => "recentchanges", call => \&checkconfig);
        hook(type => "refresh", id => "recentchanges", call => \&refresh);

-       hook(type => "htmlize", id => "_change", call => \&htmlize);

        hook(type => "pagetemplate", id => "recentchanges", call => \&pagetemplate);
        hook(type => "pagetemplate", id => "recentchanges", call => \&pagetemplate);

-} #}}}
-
-sub checkconfig () { #{{{
+       hook(type => "htmlize", id => "_change", call => \&htmlize);
+       # 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};
        $config{recentchangespage}='recentchanges' unless defined $config{recentchangespage};
        $config{recentchangesnum}=100 unless defined $config{recentchangesnum};

-} #}}}
+}

 
 

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

        my %seen;
 
        # add new changes
        my %seen;
 
        # add new changes


@@ -27,34 +54,36 @@ sub refresh ($) { #{{{
        
        # delete old and excess changes
        foreach my $page (keys %pagesources) {
        
        # 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});
                }
        }
                        unlink($config{srcdir}.'/'.$pagesources{$page});
                }
        }

-} #}}}
+}

 
 # Enable the recentchanges link on wiki pages.
 
 # Enable the recentchanges link on wiki pages.

-sub pagetemplate (@) { #{{{
+sub pagetemplate (@) {

        my %params=@_;
        my $template=$params{template};
        my $page=$params{page};
        my %params=@_;
        my $template=$params{template};
        my $page=$params{page};

-       if ($config{rcs} && $page ne $config{recentchangespage} &&
+
+       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);
        }
            $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.
 
 # Pages with extension _change have plain html markup, pass through.

-sub htmlize (@) { #{{{
+sub htmlize (@) {

        my %params=@_;
        return $params{content};
        my %params=@_;
        return $params{content};

-} #}}}
+}

 
 

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

        my $change=shift;
 
        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).
 
        # Optimisation to avoid re-writing pages. Assumes commits never
        # change (or that any changes are not important).


@@ -65,13 +94,18 @@ sub store ($$$) { #{{{
        delete @{$change->{pages}}[10 .. @{$change->{pages}}] if $is_excess;
        $change->{pages} = [
                map {
        delete @{$change->{pages}}[10 .. @{$change->{pages}}] if $is_excess;
        $change->{pages} = [
                map {

-                       if (length $config{url}) {
-                               $_->{link} = "<a href=\"$config{url}/".
-                                       urlto($_->{page},"")."\">".
-                                       IkiWiki::pagetitle($_->{page})."</a>";
+                       if (length $config{cgiurl}) {
+                               $_->{link} = "<a href=\"".
+                                       IkiWiki::cgiurl(
+                                               do => "goto",
+                                               page => $_->{page}
+                                       ).
+                                       "\" rel=\"nofollow\">".
+                                       pagetitle($_->{page}).
+                                       "</a>"

                        }
                        else {
                        }
                        else {

-                               $_->{link} = IkiWiki::pagetitle($_->{page});
+                               $_->{link} = pagetitle($_->{page});

                        }
                        $_->{baseurl}="$config{url}/" if length $config{url};
 
                        }
                        $_->{baseurl}="$config{url}/" if length $config{url};
 


@@ -87,17 +121,20 @@ sub store ($$$) { #{{{
                $change->{authorurl}=$change->{user};
                $change->{user}=$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 => IkiWiki::userpage($change->{author}),
+               );

        }
 
        }
 

-       # escape  wikilinks and preprocessor stuff in commit messages

        if (ref $change->{message}) {
                foreach my $field (@{$change->{message}}) {
                        if (exists $field->{line}) {
        if (ref $change->{message}) {
                foreach my $field (@{$change->{message}}) {
                        if (exists $field->{line}) {

-                               $field->{line} =~ s/(?<!\\)\[\[/\\\[\[/g;
+                               # escape html
+                               $field->{line} = encode_entities($field->{line});
+                               # escape links and preprocessor stuff
+                               $field->{line} = encode_entities($field->{line}, '\[\]');

                        }
                }
        }
                        }
                }
        }


@@ -109,8 +146,13 @@ sub store ($$$) { #{{{
                commitdate => displaytime($change->{when}, "%X %x"),
                wikiname => $config{wikiname},
        );
                commitdate => displaytime($change->{when}, "%X %x"),
                wikiname => $config{wikiname},
        );

+       
+       $template->param(permalink => "$config{url}/$config{recentchangespage}/#change-".titlepage($change->{rev}))
+               if exists $config{url};
+       

        IkiWiki::run_hooks(pagetemplate => sub {
        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";
        });
 
        my $file=$page."._change";


@@ -118,12 +160,6 @@ sub store ($$$) { #{{{
        utime $change->{when}, $change->{when}, "$config{srcdir}/$file";
 
        return $page;
        utime $change->{when}, $change->{when}, "$config{srcdir}/$file";
 
        return $page;

-} #}}}
-
-sub updatechanges ($$) { #{{{
-       my $subdir=shift;
-       my @changes=@{shift()};
-       
-} #}}}
+}

 
 1
 
 1