X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/fbf145ca3ff18985d0885ed939ee63123add9dbd..9d5075ab521a24d718a2b663e11856c8cc80eb03:/IkiWiki/Plugin/comments.pm

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index d1105b366..4ed696026 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -9,6 +9,7 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 use Encode;
+use POSIX qw(strftime);
 
 use constant PREVIEW => "Preview";
 use constant POST_COMMENT => "Post comment";
@@ -17,7 +18,7 @@ use constant CANCEL => "Cancel";
 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);
@@ -89,12 +90,10 @@ sub preprocess { # {{{
 		($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");
 	}
 
@@ -302,7 +301,7 @@ sub sessioncgi ($$) { #{{{
 
 	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};
@@ -405,7 +404,7 @@ sub sessioncgi ($$) { #{{{
 	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')) {
@@ -439,7 +438,7 @@ sub sessioncgi ($$) { #{{{
 		$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";
 
@@ -560,6 +559,8 @@ sub pagetemplate (@) { #{{{
 				reverse => 'yes',
 				page => $page,
 				destpage => $params{destpage},
+				feedfile => 'comments',
+				emptyfeeds => 'no',
 			);
 			$comments = IkiWiki::preprocess_inline(@args);
 		}