From 1af8db763b76856a3f8fb4d79333b19ef5083637 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 5 Feb 2010 23:06:29 -0500 Subject: revert accidental code change --- IkiWiki/Plugin/httpauth.pm | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'IkiWiki') diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm index c1811643b..127c321f0 100644 --- a/IkiWiki/Plugin/httpauth.pm +++ b/IkiWiki/Plugin/httpauth.pm @@ -9,8 +9,6 @@ use IkiWiki 3.00; sub import { hook(type => "getsetup", id => "httpauth", call => \&getsetup); hook(type => "auth", id => "httpauth", call => \&auth); - hook(type => "canedit", id => "httpauth", call => \&canedit, - last => 1); } sub getsetup () { @@ -35,20 +33,10 @@ sub auth ($$) { if (defined $cgi->remote_user()) { $session->param("name", $cgi->remote_user()); } -} - -sub canedit ($$$) { - my $page=shift; - my $cgi=shift; - my $session=shift; - - if (! defined $cgi->remote_user() && defined $config{cgiauthurl}) { + elsif (defined $config{cgiauthurl}) { IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string()); exit; } - else { - return undef; - } } 1 -- cgit v1.2.3