summaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-08-30 18:32:32 -0400
committerJoey Hess <joey@kitenet.net>2010-08-30 18:33:00 -0400
commitf55c7d13966ff1cd90ddf50e05829f6bb3eda557 (patch)
tree1107d6c0672474bf53ea54960c580a8b23e858b2 /IkiWiki
parent2df0999e4033278a6cc8f6e2d00449224aa09efa (diff)
httpauth: Avoid redirecting the user to the cgiauthurl if they already have a login session.
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/Plugin/httpauth.pm2
1 files changed, 2 insertions, 0 deletions
diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
index 868862f4f..cb488449d 100644
--- a/IkiWiki/Plugin/httpauth.pm
+++ b/IkiWiki/Plugin/httpauth.pm
@@ -84,6 +84,8 @@ sub canedit ($$$) {
my $session=shift;
if (! defined $cgi->remote_user() &&
+ (! defined $session->param("name") ||
+ ! IkiWiki::userinfo_get($session->param("name"), "regdate")) &&
defined $config{httpauth_pagespec} &&
length $config{httpauth_pagespec} &&
defined $config{cgiauthurl} &&