sub htmlize_pending {
my %params = @_;
- return sprintf(gettext("comment pending %s"),
+ return sprintf(gettext("this comment needs %s"),
'<a href="'.
IkiWiki::cgiurl(do => "commentmoderation").'">'.
gettext("moderation").'</a>');
$postcomment=0;
if (! $ok) {
- $location=unique_comment_location($page, $content, $config{srcdir});
+ $location=unique_comment_location($page, $content, $config{srcdir}, "._comment_pending");
writefile("$location._comment_pending", $config{srcdir}, $content);
# Refresh so anything that deals with pending
my %vars=$cgi->Vars;
my $added=0;
foreach my $id (keys %vars) {
- if ($id =~ /(.*)\Q._comment(?:_pending)?\E$/) {
+ if ($id =~ /(.*)\._comment(?:_pending)?$/) {
my $action=$cgi->param($id);
next if $action eq 'Defer' && ! $rejectalldefer;
id => $id,
view => $preview,
}
- } sort { $b->[1] <=> $a->[1] } comments_pending();
+ } sort { $b->[2] <=> $a->[2] } comments_pending();
my $template=template("commentmoderation.tmpl");
$template->param(
return @comments;
}
-sub unique_comment_location ($$$) {
+sub unique_comment_location ($$$$) {
my $page=shift;
-
eval q{use Digest::MD5 'md5_hex'};
error($@) if $@;
my $content_md5=md5_hex(Encode::encode_utf8(shift));
-
my $dir=shift;
+ my $ext=shift || "._comment";
my $location;
my $i = num_comments($page, $dir);
do {
$i++;
$location = "$page/$config{comments_pagename}${i}_${content_md5}";
- } while (-e "$dir/$location._comment" ||
- -e "$dir/$location._comment_pending");
+ } while (-e "$dir/$location$ext");
return $location;
}