smcvpostcomment: indicate in form whether HTML and directives are allowed

[ikiwiki.git] / IkiWiki / Plugin / smcvpostcomment.pm

diff --git a/IkiWiki/Plugin/smcvpostcomment.pm b/IkiWiki/Plugin/smcvpostcomment.pm
index 9d3f3e858e3e94781ecc46ff51becb3f5ec61d97..2b9f1e5dcb390284df1d56e79a4d4671b78e6f0a 100644 (file)
--- a/IkiWiki/Plugin/smcvpostcomment.pm
+++ b/IkiWiki/Plugin/smcvpostcomment.pm
@@ -113,7 +113,6 @@ sub sessioncgi ($$) { #{{{
        return unless $do eq PLUGIN;
 
        # These are theoretically configurable, but currently hard-coded
-       my $allow_wikilinks = 0;
        my $allow_directives = 0;
        my $commit_comments = 1;
 
@@ -149,7 +148,7 @@ sub sessioncgi ($$) { #{{{
        $form->field(name => 'sid', type => 'hidden', value => $session->id,
                force => 1);
        $form->field(name => 'page', type => 'hidden');
-       $form->field(name => 'subject', type => 'text', size => 80);
+       $form->field(name => 'subject', type => 'text', size => 72);
        $form->field(name => 'body', type => 'textarea', rows => 5,
                cols => 80);
 
@@ -172,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(
@@ -187,15 +188,30 @@ sub sessioncgi ($$) { #{{{
                exit;
        }
 
+       IkiWiki::check_canedit($page . "[" . PLUGIN . "]", $cgi, $session);
+
        my ($authorurl, $author) = linkuser(getcgiuser($session));
 
-       my $body = $form->field('body');
+       my $body = $form->field('body') || '';
        $body =~ s/\r\n/\n/g;
        $body =~ s/\r/\n/g;
-       $body .= "\n" if $body !~ /\n$/;
+       $body = "\n" if $body !~ /\n$/;
+
+       unless ($allow_directives) {
+               # don't allow new-style directives at all
+               $body =~ s/(^|[^\\])\[\[!/$1\\[[!/g;
 
-       $body =~ s/\[\[([^!])/[[$1/g unless $allow_wikilinks;
-       $body =~ s/\[\[!/[[!/g unless $allow_directives;
+               # don't allow [[ unless it begins an old-style
+               # wikilink, if prefix_directives is off
+               $body =~ s/(^|[^\\])\[\[(?![^\n\s\]+]\]\])/$1\\[[!/g
+                       unless $config{prefix_directives};
+       }
+
+       unless ($allow_html) {
+               $body =~ s/&(\w|#)/&$1/g;
+               $body =~ s/</&lt;/g;
+               $body =~ s/>/&gt;/g;
+       }
 
        # In this template, the [[!meta]] directives should stay at the end,
        # so that they will override anything the user specifies. (For
@@ -215,6 +231,8 @@ sub sessioncgi ($$) { #{{{
        # - this means that if they do, rocks fall and everyone dies
 
        if ($form->submitted eq PREVIEW) {
+               # $fake is a location that has the same number of slashes
+               # as the eventual location of this comment.
                my $fake = "$page/_" . PLUGIN . "hypothetical";
                my $preview = IkiWiki::htmlize($fake, $page, 'mdwn',
                                IkiWiki::linkify($page, $page,
@@ -299,4 +317,16 @@ sub sessioncgi ($$) { #{{{
        exit;
 } #}}}
 
+package IkiWiki::PageSpec;
+
+sub match_smcvpostcomment ($$;@) {
+       my $page = shift;
+       my $glob = shift;
+
+       unless ($page =~ s/\[smcvpostcomment\]$//) {
+               return IkiWiki::FailReason->new("not posting a comment");
+       }
+       return match_glob($page, $glob);
+}
+
 1