diff options
| author | Joey Hess <joey@kitenet.net> | 2010-06-23 16:32:20 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-06-23 16:35:51 -0400 |
| commit | 4292802ee5f93f7ec7644c5d0a30f7ffeb95e566 (patch) | |
| tree | 603a4a6f366f411b2ef1909825d400db6ad65bc7 /IkiWiki/Plugin/lockedit.pm | |
| parent | b4a43406f61b7ff9ab77d242edf4d59369ac8596 (diff) | |
| download | ikiwiki-4292802ee5f93f7ec7644c5d0a30f7ffeb95e566.tar ikiwiki-4292802ee5f93f7ec7644c5d0a30f7ffeb95e566.tar.gz | |
stop using REMOTE_ADDR
Everywhere that REMOTE_ADDR was used, a session object is available, so
instead use its remote_addr method.
In IkiWiki::Receive, stop setting a dummy REMOTE_ADDR.
Note that it's possible for a session cookie to be obtained using one IP
address, and then used from another IP. In this case, the first IP will now
be used. I think that should be ok.
Diffstat (limited to 'IkiWiki/Plugin/lockedit.pm')
| -rw-r--r-- | IkiWiki/Plugin/lockedit.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm index 1466e8337..5b50fd115 100644 --- a/IkiWiki/Plugin/lockedit.pm +++ b/IkiWiki/Plugin/lockedit.pm @@ -38,7 +38,7 @@ sub canedit ($$) { if (defined $config{locked_pages} && length $config{locked_pages} && pagespec_match($page, $config{locked_pages}, user => $session->param("name"), - ip => $ENV{REMOTE_ADDR}, + ip => $session->remote_addr(), )) { if ((! defined $user || ! IkiWiki::userinfo_get($session->param("name"), "regdate")) && |