X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/dd1fa13bce872141442ff134610e4b9175605a4e..f3735891cad0ca00f72ca4c68d444ca61382ad4b:/IkiWiki/Plugin/comments.pm

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 888c9fd9c..6c8952d45 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -9,15 +9,18 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 use Encode;
+use POSIX qw(strftime);
 
 use constant PREVIEW => "Preview";
 use constant POST_COMMENT => "Post comment";
 use constant CANCEL => "Cancel";
 
+my $postcomment;
+
 sub import { #{{{
 	hook(type => "checkconfig", id => 'comments',  call => \&checkconfig);
 	hook(type => "getsetup", id => 'comments',  call => \&getsetup);
-	hook(type => "preprocess", id => 'comment', call => \&preprocess);
+	hook(type => "preprocess", id => '_comment', call => \&preprocess);
 	hook(type => "sessioncgi", id => 'comment', call => \&sessioncgi);
 	hook(type => "htmlize", id => "_comment", call => \&htmlize);
 	hook(type => "pagetemplate", id => "comments", call => \&pagetemplate);
@@ -25,6 +28,68 @@ sub import { #{{{
 	IkiWiki::loadplugin("inline");
 } # }}}
 
+sub getsetup () { #{{{
+	return
+		plugin => {
+			safe => 1,
+			rebuild => 1,
+		},
+		# Pages where comments are shown, but new comments are not
+		# allowed, will show "Comments are closed".
+		comments_shown_pagespec => {
+			type => 'pagespec',
+			example => 'blog/*',
+			default => '',
+			description => 'PageSpec for pages where comments will be shown inline',
+			link => 'ikiwiki/PageSpec',
+			safe => 1,
+			rebuild => 1,
+		},
+		comments_open_pagespec => {
+			type => 'pagespec',
+			example => 'blog/* and created_after(close_old_comments)',
+			default => '',
+			description => 'PageSpec for pages where new comments can be posted',
+			link => 'ikiwiki/PageSpec',
+			safe => 1,
+			rebuild => 1,
+		},
+		comments_pagename => {
+			type => 'string',
+			example => 'comment_',
+			default => 'comment_',
+			description => 'Base name for comments, e.g. "comment_" for pages like "sandbox/comment_12"',
+			safe => 0, # manual page moving required
+			rebuild => undef,
+		},
+		comments_allowdirectives => {
+			type => 'boolean',
+			default => 0,
+			example => 0,
+			description => 'Interpret directives in comments?',
+			safe => 1,
+			rebuild => 0,
+		},
+		comments_allowauthor => {
+			type => 'boolean',
+			default => 0,
+			example => 0,
+			description => 'Allow anonymous commenters to set an author name?',
+			safe => 1,
+			rebuild => 0,
+		},
+		comments_commit => {
+			type => 'boolean',
+			example => 1,
+			default => 1,
+			description => 'commit comments to the VCS',
+			# old uncommitted comments are likely to cause
+			# confusion if this is changed
+			safe => 0,
+			rebuild => 0,
+		},
+} #}}}
+
 sub htmlize { # {{{
 	my %params = @_;
 	return $params{content};
@@ -47,12 +112,12 @@ sub preprocess { # {{{
 	my $page = $params{page};
 
 	my $format = $params{format};
-	if (defined $format && !exists $IkiWiki::hooks{htmlize}{$format}) {
+	if (defined $format && ! exists $IkiWiki::hooks{htmlize}{$format}) {
 		error(sprintf(gettext("unsupported page format %s"), $format));
 	}
 
 	my $content = $params{content};
-	if (!defined $content) {
+	if (! defined $content) {
 		error(gettext("comment must have content"));
 	}
 	$content =~ s/\\"/"/g;
@@ -100,10 +165,10 @@ sub preprocess { # {{{
 	$pagestate{$page}{comments}{commentip} = $commentip;
 	$pagestate{$page}{comments}{commentauthor} = $commentauthor;
 	$pagestate{$page}{comments}{commentauthorurl} = $commentauthorurl;
-	if (!defined $pagestate{$page}{meta}{author}) {
+	if (! defined $pagestate{$page}{meta}{author}) {
 		$pagestate{$page}{meta}{author} = $commentauthor;
 	}
-	if (!defined $pagestate{$page}{meta}{authorurl}) {
+	if (! defined $pagestate{$page}{meta}{authorurl}) {
 		$pagestate{$page}{meta}{authorurl} = $commentauthorurl;
 	}
 
@@ -144,68 +209,6 @@ sub preprocess { # {{{
 	return $content;
 } # }}}
 
-sub getsetup () { #{{{
-	return
-		plugin => {
-			safe => 1,
-			rebuild => 1,
-		},
-		# Pages where comments are shown, but new comments are not
-		# allowed, will show "Comments are closed".
-		comments_shown_pagespec => {
-			type => 'pagespec',
-			example => 'blog/*',
-			default => '',
-			description => 'PageSpec for pages where comments will be shown inline',
-			link => 'ikiwiki/PageSpec',
-			safe => 1,
-			rebuild => 1,
-		},
-		comments_open_pagespec => {
-			type => 'pagespec',
-			example => 'blog/* and created_after(close_old_comments)',
-			default => '',
-			description => 'PageSpec for pages where new comments can be posted',
-			link => 'ikiwiki/PageSpec',
-			safe => 1,
-			rebuild => 1,
-		},
-		comments_pagename => {
-			type => 'string',
-			example => 'comment_',
-			default => 'comment_',
-			description => 'Base name for comments, e.g. "comment_" for pages like "sandbox/comment_12"',
-			safe => 0, # manual page moving will required
-			rebuild => undef,
-		},
-		comments_allowdirectives => {
-			type => 'boolean',
-			default => 0,
-			example => 0,
-			description => 'Interpret directives in comments?',
-			safe => 1,
-			rebuild => 0,
-		},
-		comments_allowauthor => {
-			type => 'boolean',
-			default => 0,
-			example => 0,
-			description => 'Allow anonymous commenters to set an author name?',
-			safe => 1,
-			rebuild => 0,
-		},
-		comments_commit => {
-			type => 'boolean',
-			example => 1,
-			default => 1,
-			description => 'commit comments to the VCS',
-			# old uncommitted comments are likely to cause
-			# confusion if this is changed
-			safe => 0,
-			rebuild => 0,
-		},
-} #}}}
-
 sub checkconfig () { #{{{
 	$config{comments_commit} = 1 unless defined $config{comments_commit};
 	$config{comments_pagename} = 'comment_'
@@ -218,7 +221,7 @@ sub linkcgi ($) { #{{{
 	if (defined $cgi->param('do') && $cgi->param('do') eq "commenter") {
 
 		my $page=decode_utf8($cgi->param("page"));
-		if (!defined $page) {
+		if (! defined $page) {
 			error("missing page parameter");
 		}
 
@@ -307,7 +310,7 @@ sub sessioncgi ($$) { #{{{
 	}
 	my @page_types;
 	if (exists $IkiWiki::hooks{htmlize}) {
-		@page_types = grep { !/^_/ } keys %{$IkiWiki::hooks{htmlize}};
+		@page_types = grep { ! /^_/ } keys %{$IkiWiki::hooks{htmlize}};
 	}
 
 	my $allow_author = $config{comments_allowauthor};
@@ -323,7 +326,7 @@ sub sessioncgi ($$) { #{{{
 
 	$form->tmpl_param(username => $session->param('name'));
 
-	if ($allow_author and !defined $session->param('name')) {
+	if ($allow_author and ! defined $session->param('name')) {
 		$form->tmpl_param(allowauthor => 1);
 		$form->field(name => 'author', type => 'text', size => '40');
 		$form->field(name => 'url', type => 'text', size => '40');
@@ -340,7 +343,7 @@ sub sessioncgi ($$) { #{{{
 	# it to file_pruned anyway
 	my $page = $form->field('page');
 	$page = IkiWiki::possibly_foolish_untaint($page);
-	if (!defined $page || !length $page ||
+	if (! defined $page || ! length $page ||
 		IkiWiki::file_pruned($page, $config{srcdir})) {
 		error(gettext("bad page name"));
 	}
@@ -382,7 +385,11 @@ sub sessioncgi ($$) { #{{{
 			$page));
 	}
 
-	IkiWiki::check_canedit($page . "[postcomment]", $cgi, $session);
+	# Set a flag to indicate that we're posting a comment,
+	# so that postcomment() can tell it should match.
+	$postcomment=1;
+	IkiWiki::check_canedit($page, $cgi, $session);
+	$postcomment=0;
 
 	my $editcontent = $form->field('editcontent') || '';
 	$editcontent =~ s/\r\n/\n/g;
@@ -403,7 +410,7 @@ sub sessioncgi ($$) { #{{{
 	my $anchor = "${comments_pagename}${i}";
 
 	$editcontent =~ s/"/\\"/g;
-	my $content = "[[!comment format=$type\n";
+	my $content = "[[!_comment format=$type\n";
 
 	# FIXME: handling of double quotes probably wrong?
 	if (defined $session->param('name')) {
@@ -437,7 +444,7 @@ sub sessioncgi ($$) { #{{{
 		$content .= " subject=\"$subject\"\n";
 	}
 
-	$content .= " date=\"" . IkiWiki::formattime(time, '%X %x') . "\"\n";
+	$content .= " date=\"" . decode_utf8(strftime('%Y-%m-%dT%H:%M:%SZ', gmtime)) . "\"\n";
 
 	$content .= " content=\"\"\"\n$editcontent\n\"\"\"]]\n";
 
@@ -548,10 +555,7 @@ sub pagetemplate (@) { #{{{
 		}
 
 		if ($shown) {
-			eval q{use IkiWiki::Plugin::inline};
-			error($@) if $@;
-
-			my @args = (
+			$comments = IkiWiki::preprocess_inline(
 				pages => "internal($page/${comments_pagename}*)",
 				template => 'comments_display',
 				show => 0,
@@ -561,7 +565,6 @@ sub pagetemplate (@) { #{{{
 				feedfile => 'comments',
 				emptyfeeds => 'no',
 			);
-			$comments = IkiWiki::preprocess_inline(@args);
 		}
 
 		if (defined $comments && length $comments) {
@@ -602,7 +605,7 @@ sub match_postcomment ($$;@) {
 	my $page = shift;
 	my $glob = shift;
 
-	unless ($page =~ s/\[postcomment\]$//) {
+	if (! $postcomment) {
 		return IkiWiki::FailReason->new("not posting a comment");
 	}
 	return match_glob($page, $glob);