X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/38a088a433d53eadfe1a457460fa7b702bdbe64c..620289943c25046e63d9d9216c91fef5ab381662:/ikiwiki-comment.in

diff --git a/ikiwiki-comment.in b/ikiwiki-comment.in
index c742d7063..0891766ab 100755
--- a/ikiwiki-comment.in
+++ b/ikiwiki-comment.in
@@ -14,12 +14,15 @@ sub main {
 	my $pagefile=shift || usage();
 	my $interactive = -t STDIN;
 	my $content;
-	my ($format, $username, $subject, $date);
+	my ($format, $username, $subject, $date, $url, $email, $ip);
 	GetOptions(
 		'format:s'	=> \$format,
 		'username:s'	=> \$username,
 		'subject:s'	=> \$subject,
 		'date:s'	=> \$date,
+		'url:s'		=> \$url,
+		'email:s'	=> \$email,
+		'ip:s'		=> \$ip,
 	) || usage();
 
 	my $dir=get_dir($pagefile);
@@ -31,16 +34,22 @@ sub main {
 		$format		||= 'mdwn';
 		$username	||= get_username();
 		$subject	||= get_subject($page, $dir);
-		$date		||= get_date();
+		$date		||= IkiWiki::Plugin::comments::commentdate();
+		$url		||= undef;
+		$email		||= undef;
+		$ip		||= undef;
 	} else {
 		$format		||= undef;
 		die "must supply username" unless defined $username;
 		$subject	||= get_subject($page, $dir);
 		die "must supply date" unless defined $date;
+		$url		||= undef;
+		$email		||= undef;
+		$ip		||= undef;
 		chomp($content = join('', <STDIN>));
 	}
 
-	my $comment=get_comment($format, $username, $subject, $date, $content);
+	my $comment=get_comment($format, $username, $subject, $date, $url, $email, $ip, $content);
 
 	# For interactive use, this will yield a hash of the comment before
 	# it's edited, but that's ok; the date provides sufficient entropy
@@ -80,21 +89,17 @@ sub get_subject {
 	return "comment $comment_num";
 }
 
-sub get_date {
-	my $date = IkiWiki::Plugin::comments::commentdate();
-	$date =~ s|^date=\\"||;
-	$date =~ s|\\"$||;
-	return $date;
-}
-
 sub get_comment {
-	my ($format, $username, $subject, $date, $content) = @_;
+	my ($format, $username, $subject, $date, $url, $email, $ip, $content) = @_;
 	$format = defined $format ? $format = " format=$format" : q{};
 	$content = '' unless defined $content;
 	my $comment="[[!comment$format\n";
 	$comment.=" username=\"$username\"\n";
 	$comment.=" subject=\"\"\"$subject\"\"\"\n";
 	$comment.=" date=\"$date\"\n";
+	$comment.=" url=\"$url\"\n" if defined $url;
+	$comment.=" email=\"$email\"\n" if defined $email;
+	$comment.=" ip=\"$ip\"\n" if defined $ip;
 	$comment.=" content=\"\"\"\n$content\n\"\"\"]]\n";
 	return $comment;
 }