git: Record the username from openid in the git author email. (This avoids display...

[git.ikiwiki.info.git] / IkiWiki / Plugin / comments.pm

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 17cd99c3b92008b0ee4f35c4ca8f3aaaabe2df7d..41c6948e846557703717cb7ad83f1e41ca477c82 100644 (file)
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -402,8 +402,8 @@ sub editcomment ($$) {
                $username =~ s/"/"/g;
                $content .= " username=\"$username\"\n";
        }
-       elsif (defined $ENV{REMOTE_ADDR}) {
-               my $ip = $ENV{REMOTE_ADDR};
+       elsif (defined $session->remote_addr()) {
+               my $ip = $session->remote_addr();
                if ($ip =~ m/^([.0-9]+)$/) {
                        $content .= " ip=\"$1\"\n";
                }
@@ -513,8 +513,10 @@ sub editcomment ($$) {
 
                        IkiWiki::rcs_add($file);
                        IkiWiki::disable_commit_hook();
-                       $conflict = IkiWiki::rcs_commit_staged($message,
-                               $session->param('name'), $ENV{REMOTE_ADDR});
+                       $conflict = IkiWiki::rcs_commit_staged(
+                               message => $message,
+                               session => $session,
+                       );
                        IkiWiki::enable_commit_hook();
                        IkiWiki::rcs_update();
                }
@@ -602,8 +604,10 @@ sub commentmoderation ($$) {
                        if ($config{rcs} and $config{comments_commit}) {
                                my $message = gettext("Comment moderation");
                                IkiWiki::disable_commit_hook();
-                               $conflict=IkiWiki::rcs_commit_staged($message,
-                                       $session->param('name'), $ENV{REMOTE_ADDR});
+                               $conflict=IkiWiki::rcs_commit_staged(
+                                       message => $message,
+                                       session => $session,
+                               );
                                IkiWiki::enable_commit_hook();
                                IkiWiki::rcs_update();
                        }
@@ -669,7 +673,7 @@ sub comments_pending () {
                my $extension=shift;
                return unless -d $dir;
 
-               chdir($dir) || die "chdir: $!";
+               chdir($dir) || die "chdir $dir: $!";
 
                find({
                        no_chdir => 1,
@@ -686,7 +690,7 @@ sub comments_pending () {
                        }
                }, ".");
 
-               chdir($origdir) || die "chdir: $!";
+               chdir($origdir) || die "chdir $origdir: $!";
        };
        
        $find_comments->($config{srcdir}, "._comment_pending");