patch so far

master
Joey Hess 2010-02-11 16:36:19 -05:00
parent c47712b340
commit f2d6d4f6b2
1 changed files with 17 additions and 3 deletions

View File

@ -9,6 +9,8 @@ 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 () {
@ -33,9 +35,21 @@ sub auth ($$) {
if (defined $cgi->remote_user()) {
$session->param("name", $cgi->remote_user());
}
elsif (defined $config{cgiauthurl}) {
IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string());
exit;
}
sub canedit ($$$) {
my $page=shift;
my $cgi=shift;
my $session=shift;
if (! defined $cgi->remote_user() && defined $config{cgiauthurl}) {
return sub {
IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string());
exit;
};
}
else {
return undef;
}
}