From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Mon, 17 Nov 2008 09:08:54 +0000 (+0000)
Subject: smcvpostcomment: indicate in form whether HTML and directives are allowed
X-Git-Tag: 2.71~143
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/d18adfb1adedff996dfea9b20a3f1765addbec04

smcvpostcomment: indicate in form whether HTML and directives are allowed
---

diff --git a/IkiWiki/Plugin/smcvpostcomment.pm b/IkiWiki/Plugin/smcvpostcomment.pm
index 07f008e5e..2b9f1e5dc 100644
--- a/IkiWiki/Plugin/smcvpostcomment.pm
+++ b/IkiWiki/Plugin/smcvpostcomment.pm
@@ -171,7 +171,9 @@ sub sessioncgi ($$) { #{{{
 	$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(
diff --git a/templates/smcvpostcomment_form.tmpl b/templates/smcvpostcomment_form.tmpl
index 9bce62396..7f138a450 100644
--- a/templates/smcvpostcomment_form.tmpl
+++ b/templates/smcvpostcomment_form.tmpl
@@ -6,8 +6,10 @@
 Subject: <TMPL_VAR FIELD-SUBJECT><br />
 <TMPL_VAR FIELD-BODY><br />
 <TMPL_VAR FORM-SUBMIT><br />
-<TMPL_VAR HELPONFORMATTINGLINK>
-<TMPL_VAR FORM-END>
+<TMPL_VAR HELPONFORMATTINGLINK><br />
+HTML is <TMPL_UNLESS NAME="ALLOWHTML">not </TMPL_UNLESS>allowed.<br />
+IkiWiki directives ([[!directive]]) are <TMPL_UNLESS NAME="ALLOWDIRECTIVES">not </TMPL_UNLESS>allowed.<br />
+<TMPL_VAR NAME="FORM-END">
 
 <TMPL_IF NAME="PAGE_PREVIEW">
 <hr />