comments: use CGI module's checksessionexpiry
authorSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Sat, 22 Nov 2008 21:54:31 +0000 (21:54 +0000)
committerSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Thu, 11 Dec 2008 21:14:03 +0000 (21:14 +0000)
IkiWiki/Plugin/comments.pm

index f10400db1df4a1bdc5cedce5431d27a223c8c016..136dc258ebe06bfbfa2d735090fdd4203ab17545 100644 (file)
@@ -120,18 +120,6 @@ sub linkuser ($) { # {{{
        }
 } # }}}
 
-# FIXME: taken from IkiWiki::Plugin::editpage, should be common?
-sub checksessionexpiry ($$) { # {{{
-       my $session = shift;
-       my $sid = shift;
-
-       if (defined $session->param("name")) {
-               if (! defined $sid || $sid ne $session->id) {
-                       error(gettext("Your login session has expired."));
-               }
-       }
-} # }}}
-
 # Mostly cargo-culted from IkiWiki::plugin::editpage
 sub sessioncgi ($$) { #{{{
        my $cgi=shift;
@@ -300,7 +288,7 @@ sub sessioncgi ($$) { #{{{
                # Let's get posting. We don't check_canedit here because
                # that somewhat defeats the point of this plugin.
 
-               checksessionexpiry($session, $cgi->param('sid'));
+               IkiWiki::checksessionexpiry($session, $cgi->param('sid'));
 
                # FIXME: check that the wiki is locked right now, because
                # if it's not, there are mad race conditions!