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);
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};
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;
$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;
}
my $baseurl = urlto($params{destpage}, undef, 1);
my $anchor = "";
- my $comments_pagename = $config{comments_pagename};
- if ($params{page} =~ m/\/(\Q${comments_pagename}\E\d+)$/) {
+ if ($params{page} =~ m/\/(\Q$config{comments_pagename}\E\d+)$/) {
$anchor = $1;
}
$pagestate{$page}{meta}{permalink} = "${baseurl}#${anchor}";
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_'
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");
}
}
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};
-
$form->field(name => 'do', type => 'hidden');
$form->field(name => 'sid', type => 'hidden', value => $session->id,
force => 1);
$form->tmpl_param(username => $session->param('name'));
- if ($allow_author and !defined $session->param('name')) {
+ if ($config{comments_allowauthor} 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');
# 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"));
}
- my $allow_directives = $config{comments_allowdirectives};
- my $commit_comments = $config{comments_commit};
- my $comments_pagename = $config{comments_pagename};
-
# FIXME: is this right? Or should we be using the candidate subpage
# (whatever that might mean) as the base URL?
my $baseurl = urlto($page, undef, 1);
htmllink($page, $page, 'ikiwiki/formatting',
noimageinline => 1,
linktext => 'FormattingHelp'),
- allowdirectives => $allow_directives);
+ allowdirectives => $config{allow_directives});
if ($form->submitted eq CANCEL) {
# bounce back to the page they wanted to comment on, and exit.
$page));
}
- IkiWiki::check_canedit($page . "[postcomment]", $cgi, $session);
-
- my $editcontent = $form->field('editcontent') || '';
- $editcontent =~ s/\r\n/\n/g;
- $editcontent =~ s/\r/\n/g;
-
- # FIXME: check that the wiki is locked right now, because
- # if it's not, there are mad race conditions!
+ # 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;
# FIXME: rather a simplistic way to make the comments...
my $i = 0;
my $location;
do {
$i++;
- $location = "$page/${comments_pagename}${i}";
+ $location = "$page/$config{comments_pagename}$i";
} while (-e "$config{srcdir}/$location._comment");
- my $anchor = "${comments_pagename}${i}";
-
- $editcontent =~ s/"/\\"/g;
my $content = "[[!_comment format=$type\n";
# FIXME: handling of double quotes probably wrong?
}
}
- if ($allow_author) {
+ if ($config{comments_allowauthor}) {
my $author = $form->field('author');
if (length $author) {
$author =~ s/"/"/g;
$content .= " date=\"" . decode_utf8(strftime('%Y-%m-%dT%H:%M:%SZ', gmtime)) . "\"\n";
+ my $editcontent = $form->field('editcontent') || '';
+ $editcontent =~ s/\r\n/\n/g;
+ $editcontent =~ s/\r/\n/g;
+ $editcontent =~ s/"/\\"/g;
$content .= " content=\"\"\"\n$editcontent\n\"\"\"]]\n";
# This is essentially a simplified version of editpage:
if ($form->submitted eq POST_COMMENT && $form->validate) {
my $file = "$location._comment";
- IkiWiki::checksessionexpiry($session, $cgi->param('sid'));
+ IkiWiki::checksessionexpiry($cgi, $session);
# FIXME: could probably do some sort of graceful retry
# on error? Would require significant unwinding though
my $conflict;
- if ($config{rcs} and $commit_comments) {
+ if ($config{rcs} and $config{comments_commit}) {
my $message = gettext("Added a comment");
if (defined $form->field('subject') &&
length $form->field('subject')) {
error($conflict) if defined $conflict;
# Bounce back to where we were, but defeat broken caches
- my $anticache = "?updated=$page/${comments_pagename}${i}";
+ my $anticache = "?updated=$page/$config{comments_pagename}$i";
IkiWiki::redirect($cgi, urlto($page, undef, 1).$anticache);
}
else {
if ($template->query(name => 'comments')) {
my $comments = undef;
- my $comments_pagename = $config{comments_pagename};
-
my $open = 0;
my $shown = pagespec_match($page,
$config{comments_shown_pagespec},
location => $page);
- if (pagespec_match($page, "*/${comments_pagename}*",
+ if (pagespec_match($page, "*/$config{comments_pagename}*",
location => $page)) {
$shown = 0;
$open = 0;
}
if ($shown) {
- eval q{use IkiWiki::Plugin::inline};
- error($@) if $@;
-
- my @args = (
- pages => "internal($page/${comments_pagename}*)",
+ $comments = IkiWiki::preprocess_inline(
+ pages => "internal($page/$config{comments_pagename}*)",
template => 'comments_display',
show => 0,
reverse => 'yes',
feedfile => 'comments',
emptyfeeds => 'no',
);
- $comments = IkiWiki::preprocess_inline(@args);
}
if (defined $comments && length $comments) {
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);