Merge branch 'master' of ssh://git.ikiwiki.info

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

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 1ef79a27a958a77dde14f75dd34b1b5c75dd5763..1a50d1865071a7a92dc7882b614d7deb150fe03b 100644 (file)
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -35,6 +35,7 @@ sub import {
        # Load goto to fix up user page links for logged-in commenters
        IkiWiki::loadplugin("goto");
        IkiWiki::loadplugin("inline");
        # Load goto to fix up user page links for logged-in commenters
        IkiWiki::loadplugin("goto");
        IkiWiki::loadplugin("inline");

+       IkiWiki::loadplugin("transient");

 }
 
 sub getsetup () {
 }
 
 sub getsetup () {


@@ -104,6 +105,9 @@ sub getsetup () {
 sub checkconfig () {
        $config{comments_commit} = 1
                unless defined $config{comments_commit};
 sub checkconfig () {
        $config{comments_commit} = 1
                unless defined $config{comments_commit};

+       if (! $config{comments_commit}) {
+               $config{only_committed_changes}=0;
+       }

        $config{comments_pagespec} = ''
                unless defined $config{comments_pagespec};
        $config{comments_closed_pagespec} = ''
        $config{comments_pagespec} = ''
                unless defined $config{comments_pagespec};
        $config{comments_closed_pagespec} = ''


@@ -202,10 +206,12 @@ sub preprocess {
                        $commentopenid = $commentuser;
                }
                else {
                        $commentopenid = $commentuser;
                }
                else {

-                       $commentauthorurl = IkiWiki::cgiurl(
-                               do => 'goto',
-                               page => IkiWiki::userpage($commentuser)
-                       );
+                       if (length $config{cgiurl}) {
+                               $commentauthorurl = IkiWiki::cgiurl(
+                                       do => 'goto',
+                                       page => IkiWiki::userpage($commentuser)
+                               );
+                       }

 
                        $commentauthor = $commentuser;
                }
 
                        $commentauthor = $commentuser;
                }


@@ -434,6 +440,16 @@ sub editcomment ($$) {
                        $page));
        }
 
                        $page));
        }
 

+       # There's no UI to get here, but someone might construct the URL,
+       # leading to a comment that exists in the repository but isn't
+       # shown
+       if (!pagespec_match($page, $config{comments_pagespec},
+               location => $page)) {
+               error(sprintf(gettext(
+                       "comments on page '%s' are not allowed"),
+                       $page));
+       }
+

        if (pagespec_match($page, $config{comments_closed_pagespec},
                location => $page)) {
                error(sprintf(gettext(
        if (pagespec_match($page, $config{comments_closed_pagespec},
                location => $page)) {
                error(sprintf(gettext(


@@ -454,12 +470,15 @@ sub editcomment ($$) {
                $username =~ s/"/"/g;
                $content .= " username=\"$username\"\n";
        }
                $username =~ s/"/"/g;
                $content .= " username=\"$username\"\n";
        }

+

        if (defined $session->param('nickname')) {
                my $nickname = $session->param('nickname');
                $nickname =~ s/"/"/g;
                $content .= " nickname=\"$nickname\"\n";
        }
        if (defined $session->param('nickname')) {
                my $nickname = $session->param('nickname');
                $nickname =~ s/"/"/g;
                $content .= " nickname=\"$nickname\"\n";
        }

-       elsif (defined $session->remote_addr()) {
+
+       if (!(defined $session->param('name') || defined $session->param('nickname')) &&
+               defined $session->remote_addr()) {

                $content .= " ip=\"".$session->remote_addr()."\"\n";
        }
 
                $content .= " ip=\"".$session->remote_addr()."\"\n";
        }
 


@@ -490,8 +509,7 @@ sub editcomment ($$) {
                $subject = "comment ".(num_comments($page, $config{srcdir}) + 1);
        }
        $content .= " subject=\"$subject\"\n";
                $subject = "comment ".(num_comments($page, $config{srcdir}) + 1);
        }
        $content .= " subject=\"$subject\"\n";

-
-       $content .= " date=\"" . strftime_utf8('%Y-%m-%dT%H:%M:%SZ', gmtime) . "\"\n";
+       $content .= " date=\"" . commentdate() . "\"\n";

 
        my $editcontent = $form->field('editcontent');
        $editcontent="" if ! defined $editcontent;
 
        my $editcontent = $form->field('editcontent');
        $editcontent="" if ! defined $editcontent;


@@ -552,8 +570,8 @@ sub editcomment ($$) {
                $postcomment=0;
 
                if (! $ok) {
                $postcomment=0;
 
                if (! $ok) {

-                       $location=unique_comment_location($page, $content, $config{srcdir}, "._comment_pending");
-                       writefile("$location._comment_pending", $config{srcdir}, $content);
+                       $location=unique_comment_location($page, $content, $IkiWiki::Plugin::transient::transientdir, "._comment_pending");
+                       writefile("$location._comment_pending", $IkiWiki::Plugin::transient::transientdir, $content);

 
                        # Refresh so anything that deals with pending
                        # comments can be updated.
 
                        # Refresh so anything that deals with pending
                        # comments can be updated.


@@ -619,6 +637,10 @@ sub editcomment ($$) {
        exit;
 }
 
        exit;
 }
 

+sub commentdate () {
+       strftime_utf8('%Y-%m-%dT%H:%M:%SZ', gmtime);
+}
+

 sub getavatar ($) {
        my $user=shift;
        return undef unless defined $user;
 sub getavatar ($) {
        my $user=shift;
        return undef unless defined $user;


@@ -678,12 +700,17 @@ sub commentmoderation ($$) {
                                }
 
                                my $page=IkiWiki::dirname($f);
                                }
 
                                my $page=IkiWiki::dirname($f);

-                               my $file="$config{srcdir}/$f";
-                               my $filedir=$config{srcdir};
+                               my $filedir=$IkiWiki::Plugin::transient::transientdir;
+                               my $file="$filedir/$f";

                                if (! -e $file) {
                                        # old location
                                if (! -e $file) {
                                        # old location

-                                       $file="$config{wikistatedir}/comments_pending/".$f;
-                                       $filedir="$config{wikistatedir}/comments_pending";
+                                       $file="$config{srcdir}/$f";
+                                       $filedir=$config{srcdir};
+                                       if (! -e $file) {
+                                               # older location
+                                               $file="$config{wikistatedir}/comments_pending/".$f;
+                                               $filedir="$config{wikistatedir}/comments_pending";
+                                       }

                                }
 
                                if ($action eq 'Accept') {
                                }
 
                                if ($action eq 'Accept') {


@@ -797,6 +824,8 @@ sub comments_pending () {
                chdir($origdir) || die "chdir $origdir: $!";
        };
        
                chdir($origdir) || die "chdir $origdir: $!";
        };
        

+       $find_comments->($IkiWiki::Plugin::transient::transientdir, "._comment_pending");
+       # old location

        $find_comments->($config{srcdir}, "._comment_pending");
        # old location
        $find_comments->("$config{wikistatedir}/comments_pending/",
        $find_comments->($config{srcdir}, "._comment_pending");
        # old location
        $find_comments->("$config{wikistatedir}/comments_pending/",


@@ -988,7 +1017,7 @@ sub num_comments ($$) {
        return int @comments;
 }
 
        return int @comments;
 }
 

-sub unique_comment_location ($$$$) {
+sub unique_comment_location ($$$;$) {

        my $page=shift;
        eval q{use Digest::MD5 'md5_hex'};
        error($@) if $@;
        my $page=shift;
        eval q{use Digest::MD5 'md5_hex'};
        error($@) if $@;