X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/7a7e28c55f1ffa64eedbaf36ee1729c6bbd27762..35460e3153286381a6019e5afd46b2880a95cb88:/IkiWiki/Plugin/comments.pm

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index c95f77a42..ee53dbc91 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -25,8 +25,9 @@ sub import {
 	hook(type => "sessioncgi", id => 'comment', call => \&sessioncgi);
 	hook(type => "htmlize", id => "_comment", call => \&htmlize);
 	hook(type => "pagetemplate", id => "comments", call => \&pagetemplate);
-	hook(type => "cgi", id => "comments", call => \&linkcgi);
 	hook(type => "formbuilder_setup", id => "comments", call => \&formbuilder_setup);
+	# Load goto to fix up user page links for logged-in commenters
+	IkiWiki::loadplugin("goto");
 	IkiWiki::loadplugin("inline");
 }
 
@@ -167,7 +168,7 @@ sub preprocess {
 		}
 		else {
 			$commentauthorurl = IkiWiki::cgiurl(
-				do => 'commenter',
+				do => 'goto',
 				page => (length $config{userdir}
 					? "$config{userdir}/$commentuser"
 					: "$commentuser"));
@@ -235,35 +236,6 @@ sub preprocess {
 	return $content;
 }
 
-# This is exactly the same as recentchanges_link :-(
-sub linkcgi ($) {
-	my $cgi=shift;
-	if (defined $cgi->param('do') && $cgi->param('do') eq "commenter") {
-
-		my $page=decode_utf8($cgi->param("page"));
-		if (! defined $page) {
-			error("missing page parameter");
-		}
-
-		IkiWiki::loadindex();
-
-		my $link=bestlink("", $page);
-		if (! length $link) {
-			print "Content-type: text/html\n\n";
-			print IkiWiki::misctemplate(gettext(gettext("missing page")),
-				"<p>".
-				sprintf(gettext("The page %s does not exist."),
-					htmllink("", "", $page)).
-				"</p>");
-		}
-		else {
-			IkiWiki::redirect($cgi, urlto($link, undef, 1));
-		}
-
-		exit;
-	}
-}
-
 sub sessioncgi ($$) {
 	my $cgi=shift;
 	my $session=shift;
@@ -442,8 +414,12 @@ sub editcomment ($$) {
 	# - this means that if they do, rocks fall and everyone dies
 
 	if ($form->submitted eq PREVIEW) {
-		$form->tmpl_param(page_preview => 
-			previewcomment($content, $location, $page, time));
+		my $preview=previewcomment($content, $location, $page, time);
+		IkiWiki::run_hooks(format => sub {
+			$preview = shift->(page => $page,
+				content => $preview);
+		});
+		$form->tmpl_param(page_preview => $preview);
 	}
 	else {
 		$form->tmpl_param(page_preview => "");
@@ -473,7 +449,7 @@ sub editcomment ($$) {
 			IkiWiki::printheader($session);
 			print IkiWiki::misctemplate(gettext(gettext("comment stored for moderation")),
 				"<p>".
-				gettext("Your comment will be posted after moderator review"),
+				gettext("Your comment will be posted after moderator review").
 				"</p>");
 			exit;
 		}
@@ -539,12 +515,14 @@ sub commentmoderation ($$) {
 	if (defined $cgi->param('sid')) {
 		IkiWiki::checksessionexpiry($cgi, $session);
 
+		my $rejectalldefer=$cgi->param('rejectalldefer');
+
 		my %vars=$cgi->Vars;
 		my $added=0;
 		foreach my $id (keys %vars) {
 			if ($id =~ /(.*)\Q._comment\E$/) {
 				my $action=$cgi->param($id);
-				next if $action eq 'Defer';
+				next if $action eq 'Defer' && ! $rejectalldefer;
 
 				# Make sure that the id is of a legal
 				# pending comment before untainting.
@@ -598,16 +576,16 @@ sub commentmoderation ($$) {
 	}
 
 	my @comments=map {
-		my $id=$_;
+		my ($id, $ctime)=@{$_};
 		my $file="$config{wikistatedir}/comments_pending/$id";
 		my $content=readfile($file);
-		my $ctime=(stat($file))[10];
+		my $preview=previewcomment($content, $id,
+			IkiWiki::dirname($_), $ctime);
 		{
 			id => $id,
-			view => previewcomment($content, $id,
-					IkiWiki::dirname($_), $ctime),
+			view => $preview,
 		} 
-	} comments_pending();
+	} sort { $b->[1] <=> $a->[1] } comments_pending();
 
 	my $template=template("commentmoderation.tmpl");
 	$template->param(
@@ -615,7 +593,11 @@ sub commentmoderation ($$) {
 		comments => \@comments,
 	);
 	IkiWiki::printheader($session);
-	print IkiWiki::misctemplate(gettext("comment moderation"), $template->output);
+	my $out=$template->output;
+	IkiWiki::run_hooks(format => sub {
+		$out = shift->(page => "", content => $out);
+	});
+	print IkiWiki::misctemplate(gettext("comment moderation"), $out);
 	exit;
 }
 
@@ -623,7 +605,8 @@ sub formbuilder_setup (@) {
 	my %params=@_;
 
 	my $form=$params{form};
-	if ($form->title eq "preferences") {
+	if ($form->title eq "preferences" &&
+	    IkiWiki::is_admin($params{session}->param("name"))) {
 		push @{$params{buttons}}, "Comment Moderation";
 		if ($form->submitted && $form->submitted eq "Comment Moderation") {
 			commentmoderation($params{cgi}, $params{session});
@@ -649,8 +632,9 @@ sub comments_pending () {
 				$File::Find::prune=0;
 				my ($f)=/$config{wiki_file_regexp}/; # untaint
 				if (defined $f && $f =~ /\Q._comment\E$/) {
+					my $ctime=(stat($f))[10];
 					$f=~s/^\Q$dir\E\/?//;
-                                        push @ret, $f;
+                                        push @ret, [$f, $ctime];
 				}
 			}
 		}
@@ -667,14 +651,8 @@ sub previewcomment ($$$) {
 
 	my $preview = IkiWiki::htmlize($location, $page, '_comment',
 			IkiWiki::linkify($location, $page,
-				IkiWiki::preprocess($location, $page,
-					IkiWiki::filter($location,
-						$page, $content),
-					0, 1)));
-	IkiWiki::run_hooks(format => sub {
-			$preview = shift->(page => $page,
-				content => $preview);
-		});
+			IkiWiki::preprocess($location, $page,
+			IkiWiki::filter($location, $page, $content), 0, 1)));
 
 	my $template = template("comment.tmpl");
 	$template->param(content => $preview);