analysis

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

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 644ef1be8ceec33a7185ff8dd3492962bdabe9d6..1c10417c389cf4aedc11d0f9d510eaa134ff8b32 100644 (file)
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -7,7 +7,7 @@ package IkiWiki::Plugin::comments;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use Encode;
 use POSIX qw(strftime);
 
@@ -198,8 +198,17 @@ sub preprocess {
                        $pagestate{$page}{meta}{author} = $params{claimedauthor};
                }
 
-               if (defined $params{url} and safeurl($params{url})) {
-                       $pagestate{$page}{meta}{authorurl} = $params{url};
+               if (defined $params{url}) {
+                       my $url=$params{url};
+
+                       eval q{use URI::Heuristic}; 
+                       if (! $@) {
+                               $url=URI::Heuristic::uf_uristr($url);
+                       }
+
+                       if (safeurl($url)) {
+                               $pagestate{$page}{meta}{authorurl} = $url;
+                       }
                }
        }
        else {
@@ -432,8 +441,8 @@ sub sessioncgi ($$) {
 
        if ($form->submitted eq PREVIEW) {
                my $preview = IkiWiki::htmlize($location, $page, '_comment',
-                               IkiWiki::linkify($page, $page,
-                                       IkiWiki::preprocess($page, $page,
+                               IkiWiki::linkify($location, $page,
+                                       IkiWiki::preprocess($location, $page,
                                                IkiWiki::filter($location,
                                                        $page, $content),
                                                0, 1)));
@@ -447,6 +456,12 @@ sub sessioncgi ($$) {
                $template->param(title => $form->field('subject'));
                $template->param(ctime => displaytime(time));
 
+               IkiWiki::run_hooks(pagetemplate => sub {
+                       shift->(page => $location,
+                               destpage => $page,
+                               template => $template);
+               });
+
                $form->tmpl_param(page_preview => $template->output);
        }
        else {
@@ -491,7 +506,10 @@ sub sessioncgi ($$) {
                error($conflict) if defined $conflict;
 
                # Jump to the new comment on the page.
-               IkiWiki::redirect($cgi, urlto($page, undef, 1)."#$location");
+               # The trailing question mark tries to avoid broken
+               # caches and get the most recent version of the page.
+               IkiWiki::redirect($cgi, urlto($page, undef, 1)."#$location?updated");
+
        }
        else {
                IkiWiki::showform ($form, \@buttons, $session, $cgi,
@@ -525,6 +543,8 @@ sub pagetemplate (@) {
        my $page = $params{page};
        my $template = $params{template};
        my $shown = ($template->query(name => 'commentslink') ||
+                    $template->query(name => 'commentsurl') ||
+                    $template->query(name => 'atomcommentsurl') ||
                     $template->query(name => 'comments')) &&
                    commentsshown($page);
 
@@ -554,6 +574,22 @@ sub pagetemplate (@) {
                }
        }
 
+       if ($template->query(name => 'commentsurl')) {
+               if ($shown) {
+                       $template->param(commentsurl =>
+                               urlto($page, undef, 1).'#comments');
+               }
+       }
+
+       if ($template->query(name => 'atomcommentsurl') && $config{usedirs}) {
+               if ($shown) {
+                       # This will 404 until there are some comments, but I
+                       # think that's probably OK...
+                       $template->param(atomcommentsurl =>
+                               urlto($page, undef, 1).'comments.atom');
+               }
+       }
+
        if ($template->query(name => 'commentslink')) {
                # XXX Would be nice to say how many comments there are in
                # the link. But, to update the number, blog pages