summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>2008-11-17 09:08:54 +0000
committerSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>2008-12-11 21:14:02 +0000
commitd18adfb1adedff996dfea9b20a3f1765addbec04 (patch)
treea658b4b63eb7ea53ecf751753f30d0b77de017c9
parent1bd1b03766704bbf2271e87cf4a68978827f31fb (diff)
smcvpostcomment: indicate in form whether HTML and directives are allowed
-rw-r--r--IkiWiki/Plugin/smcvpostcomment.pm4
-rw-r--r--templates/smcvpostcomment_form.tmpl6
2 files changed, 7 insertions, 3 deletions
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 />