PLUGIN));
}
+ my $page = $params{page};
+ $pagestate{$page}{PLUGIN()}{comments} = 1;
+ $pagestate{$page}{PLUGIN()}{allowhtml} = IkiWiki::yesno($params{allowhtml});
+ $pagestate{$page}{PLUGIN()}{allowdirectives} = IkiWiki::yesno($params{allowdirectives});
+ $pagestate{$page}{PLUGIN()}{commit} = defined $params{commit}
+ ? IkiWiki::yesno($params{commit})
+ : 1;
+
my $formtemplate = IkiWiki::template(PLUGIN . "_embed.tmpl",
blind_cache => 1);
$formtemplate->param(cgiurl => $config{cgiurl});
debug("page $params{page} => destpage $params{destpage}");
- # I'm reasonably sure that this counts as abuse of [[!inline]]
- return $formtemplate->output . "\n" .
- IkiWiki::preprocess_inline(
+ my $posts = '';
+ unless (defined $params{inline} && !IkiWiki::yesno($params{inline})) {
+ my @args = (
pages => "internal($params{page}/_comment_*)",
template => PLUGIN . "_display",
show => 0,
reverse => "yes",
+ # special stuff passed through
page => $params{page},
destpage => $params{destpage},
- preview => $params{preview});
+ preview => $params{preview},
+ );
+ push @args, atom => $params{atom} if defined $params{atom};
+ push @args, rss => $params{rss} if defined $params{rss};
+ push @args, feeds => $params{feeds} if defined $params{feeds};
+ push @args, feedshow => $params{feedshow} if defined $params{feedshow};
+ push @args, timeformat => $params{timeformat} if defined $params{timeformat};
+ push @args, feedonly => $params{feedonly} if defined $params{feedonly};
+ $posts = "\n" . IkiWiki::preprocess_inline(@args);
+ }
+
+ return $formtemplate->output . $posts;
} # }}}
# FIXME: logic taken from editpage, should be common code?
my $do = $cgi->param('do');
return unless $do eq PLUGIN;
- # These are theoretically configurable, but currently hard-coded
- my $allow_directives = 0;
- my $commit_comments = 1;
-
IkiWiki::decode_cgi_utf8($cgi);
eval q{use CGI::FormBuilder};
error(gettext("bad page name"));
}
+ my $allow_directives = $pagestate{$page}{PLUGIN()}{allowdirectives};
+ my $allow_html = $pagestate{$page}{PLUGIN()}{allowdirectives};
+ my $commit_comments = defined $pagestate{$page}{PLUGIN()}{commit}
+ ? $pagestate{$page}{PLUGIN()}{commit}
+ : 1;
+
# 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);
$form->tmpl_param('helponformattinglink',
htmllink($page, $page, 'ikiwiki/formatting',
noimageinline => 1,
- linktext => 'FormattingHelp'));
+ linktext => 'FormattingHelp'),
+ allowhtml => $allow_html,
+ allowdirectives => $allow_directives);
if (not exists $pagesources{$page}) {
error(sprintf(gettext(
"page '%s' doesn't exist, so you can't comment"),
$page));
}
+ if (not $pagestate{$page}{PLUGIN()}{comments}) {
+ error(sprintf(gettext(
+ "comments are not enabled on page '%s'"),
+ $page));
+ }
if ($form->submitted eq CANCEL) {
# bounce back to the page they wanted to comment on, and exit.