X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/f77f7a02a6f235e02c4729f6f56e7c43bd8a33fb..1bd1b03766704bbf2271e87cf4a68978827f31fb:/IkiWiki/Plugin/smcvpostcomment.pm?ds=inline

diff --git a/IkiWiki/Plugin/smcvpostcomment.pm b/IkiWiki/Plugin/smcvpostcomment.pm
index cb55ff94f..07f008e5e 100644
--- a/IkiWiki/Plugin/smcvpostcomment.pm
+++ b/IkiWiki/Plugin/smcvpostcomment.pm
@@ -8,6 +8,7 @@ package IkiWiki::Plugin::smcvpostcomment;
 use warnings;
 use strict;
 use IkiWiki 2.00;
+use IkiWiki::Plugin::inline;
 use IkiWiki::Plugin::mdwn;
 use CGI 'escapeHTML';
 
@@ -38,7 +39,8 @@ sub preprocess (@) { #{{{
 	my %params=@_;
 
 	unless (length $config{cgiurl}) {
-		error("this plugin makes no sense if you have no CGI");
+		error(sprintf (gettext("[[!%s plugin requires CGI enabled]]"),
+			PLUGIN));
 	}
 
 	my $formtemplate = IkiWiki::template(PLUGIN . "_embed.tmpl",
@@ -48,15 +50,15 @@ sub preprocess (@) { #{{{
 
 	if ($params{preview}) {
 		$formtemplate->param("disabled" =>
-			'not available during Preview');
+			gettext('not available during Preview'));
 	}
 
-	debug("page $params{page} => destpage $params{page}");
+	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(
-			pages => "internal(/$params{page}/comment_*)",
+			pages => "internal($params{page}/_comment_*)",
 			template => PLUGIN . "_display",
 			show => 0,
 			reverse => "yes",
@@ -111,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;
 
@@ -147,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);
 
@@ -157,7 +158,7 @@ sub sessioncgi ($$) { #{{{
 	$page = IkiWiki::possibly_foolish_untaint($page);
 	if (!defined $page || !length $page ||
 		IkiWiki::file_pruned($page, $config{srcdir})) {
-		error ("bad page name");
+		error(gettext("bad page name"));
 	}
 
 	# FIXME: is this right? Or should we be using the candidate subpage
@@ -173,7 +174,9 @@ sub sessioncgi ($$) { #{{{
 			linktext => 'FormattingHelp'));
 
 	if (not exists $pagesources{$page}) {
-		error ("page '$page' doesn't exist, so you can't comment");
+		error(sprintf(gettext(
+			"page '%s' doesn't exist, so you can't comment"),
+			$page));
 	}
 
 	if ($form->submitted eq CANCEL) {
@@ -183,15 +186,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
@@ -211,6 +229,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,
@@ -250,7 +270,7 @@ sub sessioncgi ($$) { #{{{
 		my $file;
 		do {
 			$i++;
-			$file = "$page/comment_${i}._" . PLUGIN;
+			$file = "$page/_comment_${i}._" . PLUGIN;
 		} while (-e "$config{srcdir}/$file");
 
 		# FIXME: could probably do some sort of graceful retry
@@ -260,11 +280,10 @@ sub sessioncgi ($$) { #{{{
 		my $conflict;
 
 		if ($config{rcs} and $commit_comments) {
-			my $message = "Added a comment";
+			my $message = gettext("Added a comment");
 			if (defined $form->field('subject') &&
 				length $form->field('subject')) {
-				$message = "Added a comment: " .
-					$form->field('subject');
+				$message .= ": ".$form->field('subject');
 			}
 
 			IkiWiki::rcs_add($file);
@@ -285,7 +304,7 @@ sub sessioncgi ($$) { #{{{
 		error($conflict) if defined $conflict;
 
 		# Bounce back to where we were, but defeat broken caches
-		my $anticache = "?updated=$page/comment_$i";
+		my $anticache = "?updated=$page/_comment_$i";
 		IkiWiki::redirect($cgi, urlto($page, undef, 1).$anticache);
 	}
 	else {
@@ -296,4 +315,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