urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

comments: remove allowhtml option, just switch it on all the time 

Now that posts are individually sanitized, that should be safe.
master
Simon McVittie 2008-11-18 10:44:34 +00:00
parent 4663f364bb
commit 249ea2ed75
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
IkiWiki/Plugin/comments.pm
View File

@ -48,7 +48,6 @@ sub preprocess (@) { #{{{
$pagestate{$page}{comments}{comments} = defined $params{closed}
? (not IkiWiki::yesno($params{closed}))
: 1;
$pagestate{$page}{comments}{allowhtml} = IkiWiki::yesno($params{allowhtml});
$pagestate{$page}{comments}{allowdirectives} = IkiWiki::yesno($params{allowdirectives});
$pagestate{$page}{comments}{commit} = defined $params{commit}
? IkiWiki::yesno($params{commit})
@ -187,7 +186,6 @@ sub sessioncgi ($$) { #{{{
}
my $allow_directives = $pagestate{$page}{comments}{allowdirectives};
my $allow_html = $pagestate{$page}{comments}{allowdirectives};
my $commit_comments = defined $pagestate{$page}{comments}{commit}
? $pagestate{$page}{comments}{commit}
: 1;
@ -203,7 +201,6 @@ sub sessioncgi ($$) { #{{{
htmllink($page, $page, 'ikiwiki/formatting',
noimageinline => 1,
linktext => 'FormattingHelp'),
allowhtml => $allow_html,
allowdirectives => $allow_directives);
if (not exists $pagesources{$page}) {
@ -243,12 +240,6 @@ sub sessioncgi ($$) { #{{{
unless $config{prefix_directives};
}
unless ($allow_html) {
$body =~ s/&(\w|#)/&$1/g;
$body =~ s/</&lt;/g;
$body =~ s/>/&gt;/g;
}
IkiWiki::run_hooks(sanitize => sub {
# $fake is a possible location for this comment. We don't
# know yet what the comment number *actually* is.

2
templates/comments_form.tmpl
View File

@ -8,7 +8,7 @@ Subject: <TMPL_VAR FIELD-SUBJECT><br />
<TMPL_VAR FIELD-BODY><br />
<TMPL_VAR FORM-SUBMIT><br />
<TMPL_VAR HELPONFORMATTINGLINK><br />
HTML is <TMPL_UNLESS NAME="ALLOWHTML">not </TMPL_UNLESS>allowed.<br />
Formatting with Markdown and HTML are allowed.<br />
IkiWiki directives ([[!directive]]) are <TMPL_UNLESS NAME="ALLOWDIRECTIVES">not </TMPL_UNLESS>allowed.<br />
<TMPL_VAR NAME="FORM-END">