monotone: When getting the log, tell monotone how many entries we want, rather than...

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

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 6ab4f9d033a66e2ce57ab83b5a26b9a429811b91..4d7023c1c1e5a0af91aad4841eb85c817dfefab3 100644 (file)
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -4,6 +4,8 @@ package IkiWiki::Plugin::recentchanges;
 use warnings;
 use strict;
 use IkiWiki 2.00;
 use warnings;
 use strict;
 use IkiWiki 2.00;

+use Encode;
+use HTML::Entities;

 
 sub import { #{{{
        hook(type => "getsetup", id => "recentchanges", call => \&getsetup);
 
 sub import { #{{{
        hook(type => "getsetup", id => "recentchanges", call => \&getsetup);


@@ -16,16 +18,20 @@ sub import { #{{{
 
 sub getsetup () { #{{{
        return
 
 sub getsetup () { #{{{
        return

+               plugin => {
+                       safe => 1,
+                       rebuild => 1,
+               },

                recentchangespage => {
                        type => "string",
                recentchangespage => {
                        type => "string",

-                       default => "recentchanges",
+                       example => "recentchanges",

                        description => "name of the recentchanges page",
                        safe => 1,
                        rebuild => 1,
                },
                recentchangesnum => {
                        type => "integer",
                        description => "name of the recentchanges page",
                        safe => 1,
                        rebuild => 1,
                },
                recentchangesnum => {
                        type => "integer",

-                       default => 100,
+                       example => 100,

                        description => "number of changes to track",
                        safe => 1,
                        rebuild => 0,
                        description => "number of changes to track",
                        safe => 1,
                        rebuild => 0,


@@ -82,7 +88,7 @@ sub cgi ($) { #{{{
                # page they link to is deleted, or newly created, or
                # changes for whatever reason. So this CGI handles that
                # dynamic linking stuff.
                # page they link to is deleted, or newly created, or
                # changes for whatever reason. So this CGI handles that
                # dynamic linking stuff.

-               my $page=$cgi->param("page");
+               my $page=decode_utf8($cgi->param("page"));

                if (!defined $page) {
                        error("missing page parameter");
                }
                if (!defined $page) {
                        error("missing page parameter");
                }


@@ -99,7 +105,7 @@ sub cgi ($) { #{{{
                                "</p>");
                }
                else {
                                "</p>");
                }
                else {

-                       IkiWiki::redirect($cgi, $config{url}.IkiWiki::beautify_urlpath("/".htmlpage($link)));
+                       IkiWiki::redirect($cgi, urlto($link, undef, 1));

                }
 
                exit;
                }
 
                exit;


@@ -109,7 +115,7 @@ sub cgi ($) { #{{{
 sub store ($$$) { #{{{
        my $change=shift;
 
 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).
 
        # Optimisation to avoid re-writing pages. Assumes commits never
        # change (or that any changes are not important).


@@ -126,12 +132,12 @@ sub store ($$$) { #{{{
                                                do => "recentchanges_link",
                                                page => $_->{page}
                                        ).
                                                do => "recentchanges_link",
                                                page => $_->{page}
                                        ).

-                                       "\">".
-                                       IkiWiki::pagetitle($_->{page}).
+                                       "\" rel=\"nofollow\">".
+                                       pagetitle($_->{page}).

                                        "</a>"
                        }
                        else {
                                        "</a>"
                        }
                        else {

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

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


@@ -154,11 +160,13 @@ sub store ($$$) { #{{{
                );
        }
 
                );
        }
 

-       # 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}, '\[\]');

                        }
                }
        }
                        }
                }
        }


@@ -170,6 +178,10 @@ 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 {
                shift->(page => $page, destpage => $page,
                        template => $template, rev => $change->{rev});
        IkiWiki::run_hooks(pagetemplate => sub {
                shift->(page => $page, destpage => $page,
                        template => $template, rev => $change->{rev});