use strict;
use IkiWiki 2.00;
use Encode;
+use POSIX qw(strftime);
use constant PREVIEW => "Preview";
use constant POST_COMMENT => "Post comment";
sub import { #{{{
hook(type => "checkconfig", id => 'comments', call => \&checkconfig);
hook(type => "getsetup", id => 'comments', call => \&getsetup);
- hook(type => "preprocess", id => 'comment', call => \&preprocess);
+ hook(type => "preprocess", id => '_comment', call => \&preprocess);
hook(type => "sessioncgi", id => 'comment', call => \&sessioncgi);
hook(type => "htmlize", id => "_comment", call => \&htmlize);
hook(type => "pagetemplate", id => "comments", call => \&pagetemplate);
($commentauthorurl, $commentauthor) =
linkuser($params{username});
}
- elsif (defined $params{ip}) {
- $commentip = $params{ip};
- $commentauthor = sprintf(
- gettext("Anonymous (IP: %s)"), $params{ip});
- }
else {
+ if (defined $params{ip}) {
+ $commentip = $params{ip};
+ }
$commentauthor = gettext("Anonymous");
}
my $type = $form->param('type');
if (defined $type && length $type && $IkiWiki::hooks{htmlize}{$type}) {
- $type = possibly_foolish_untaint($type);
+ $type = IkiWiki::possibly_foolish_untaint($type);
}
else {
$type = $config{default_pageext};
my $anchor = "${comments_pagename}${i}";
$editcontent =~ s/"/\\"/g;
- my $content = "[[!comment format=$type\n";
+ my $content = "[[!_comment format=$type\n";
# FIXME: handling of double quotes probably wrong?
if (defined $session->param('name')) {
$content .= " subject=\"$subject\"\n";
}
- $content .= " date=\"" . IkiWiki::formattime(time, '%X %x') . "\"\n";
+ $content .= " date=\"" . decode_utf8(strftime('%Y-%m-%dT%H:%M:%SZ', gmtime)) . "\"\n";
$content .= " content=\"\"\"\n$editcontent\n\"\"\"]]\n";
reverse => 'yes',
page => $page,
destpage => $params{destpage},
+ feedfile => 'comments',
+ emptyfeeds => 'no',
);
$comments = IkiWiki::preprocess_inline(@args);
}