update info on my split-view setup, and ask for plugin advice

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

diff --git a/IkiWiki/Plugin/moderatedcomments.pm b/IkiWiki/Plugin/moderatedcomments.pm
index b0a328a06dffb040f2d6af4a5ba71f2b1a76f6b1..5957833fc2de44dc20484f616f8813ff0306400b 100644 (file)
--- a/IkiWiki/Plugin/moderatedcomments.pm
+++ b/IkiWiki/Plugin/moderatedcomments.pm
@@ -19,7 +19,7 @@ sub getsetup () {
                },
                moderate_pagespec => {
                        type => 'pagespec',
                },
                moderate_pagespec => {
                        type => 'pagespec',

-                       example => 'user(http://*)',
+                       example => '*',

                        description => 'PageSpec matching users or comment locations to moderate',
                        link => 'ikiwiki/PageSpec',
                        safe => 1,
                        description => 'PageSpec matching users or comment locations to moderate',
                        link => 'ikiwiki/PageSpec',
                        safe => 1,


@@ -48,11 +48,11 @@ sub checkcontent (@) {
        }
 
        my $session=$params{session};
        }
 
        my $session=$params{session};

-       my $user=$session->param("name") if $session;
+       my $user=$session->param("name");

        if (pagespec_match($params{page}, $config{moderate_pagespec},
                        location => $params{page},
                        (defined $user ? (user => $user) : ()),
        if (pagespec_match($params{page}, $config{moderate_pagespec},
                        location => $params{page},
                        (defined $user ? (user => $user) : ()),

-                       (defined $ENV{REMOTE_ADDR} ? (ip => $ENV{REMOTE_ADDR}) : ()),
+                       (defined $session->remote_addr() ? (ip => $session->remote_addr()) : ()),

        )) {
                return gettext("comment needs moderation");
        }
        )) {
                return gettext("comment needs moderation");
        }