From f55c7d13966ff1cd90ddf50e05829f6bb3eda557 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 30 Aug 2010 18:32:32 -0400
Subject: httpauth: Avoid redirecting the user to the cgiauthurl if they
 already have a login session.

---
 IkiWiki/Plugin/httpauth.pm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'IkiWiki/Plugin')

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} &&
-- 
cgit v1.2.3