Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[git.ikiwiki.info.git] / IkiWiki / Plugin / httpauth.pm

diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
index 202ca11532e357322d1a14b2b285460c2b500f11..478f6744656f5bdbd4baa00f79cadb9a74ebd255 100644 (file)
--- a/IkiWiki/Plugin/httpauth.pm
+++ b/IkiWiki/Plugin/httpauth.pm
@@ -11,8 +11,8 @@ sub import {
        hook(type => "auth", id => "httpauth", call => \&auth);
        hook(type => "formbuilder_setup", id => "httpauth",
                call => \&formbuilder_setup);
        hook(type => "auth", id => "httpauth", call => \&auth);
        hook(type => "formbuilder_setup", id => "httpauth",
                call => \&formbuilder_setup);

-       hook(type => "canedit", id => "httpauth", call => \&canedit);
-       hook(type => "pagetemplate", id => "httpauth", call => \&pagetemplate);
+       hook(type => "canedit", id => "httpauth", call => \&canedit,
+               first => 1);

 }
 
 sub getsetup () {
 }
 
 sub getsetup () {


@@ -20,6 +20,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => 0,
                plugin => {
                        safe => 1,
                        rebuild => 0,

+                       section => "auth",

                },
                cgiauthurl => {
                        type => "string",
                },
                cgiauthurl => {
                        type => "string",


@@ -41,7 +42,9 @@ sub redir_cgiauthurl ($;@) {
        my $cgi=shift;
 
        IkiWiki::redirect($cgi, 
        my $cgi=shift;
 
        IkiWiki::redirect($cgi, 

-               IkiWiki::cgiurl(cgiurl => $config{cgiauthurl}, @_));
+               @_ > 1 ? IkiWiki::cgiurl(cgiurl => $config{cgiauthurl}, @_)
+                      : $config{cgiauthurl}."?@_"
+       );

        exit;
 }
 
        exit;
 }
 


@@ -78,10 +81,8 @@ sub formbuilder_setup (@) {
 sub test_httpauth_pagespec ($) {
        my $page=shift;
 
 sub test_httpauth_pagespec ($) {
        my $page=shift;
 

-       return defined $config{httpauth_pagespec} &&
-              length $config{httpauth_pagespec} &&
-              defined $config{cgiauthurl} &&
-              pagespec_match($page, $config{httpauth_pagespec});
+       return (
+       );

 }
 
 sub canedit ($$$) {
 }
 
 sub canedit ($$$) {


@@ -89,11 +90,14 @@ sub canedit ($$$) {
        my $cgi=shift;
        my $session=shift;
 
        my $cgi=shift;
        my $session=shift;
 

-       if (! defined $cgi->remote_user() && test_httpauth_pagespec($page)) {
+       if (! defined $cgi->remote_user() &&
+           defined $config{httpauth_pagespec} &&
+           length $config{httpauth_pagespec} &&
+           defined $config{cgiauthurl} &&
+           pagespec_match($page, $config{httpauth_pagespec})) {

                return sub {
                return sub {

-                       IkiWiki::redirect($cgi, 
-                               $config{cgiauthurl}.'?'.$cgi->query_string());
-                       exit;
+                       # bounce thru cgiauthurl and back to edit action
+                       redir_cgiauthurl($cgi, $cgi->query_string());

                };
        }
        else {
                };
        }
        else {


@@ -101,18 +105,4 @@ sub canedit ($$$) {
        }
 }
 
        }
 }
 

-sub pagetemplate (@_) {
-       my %params=@_;
-       my $template=$params{template};
-
-       if ($template->param("editurl") &&
-           test_httpauth_pagespec($params{page})) {
-               # go directly to cgiauthurl when editing a page matching
-               # the pagespec
-               $template->param(editurl => IkiWiki::cgiurl(
-                       cgiurl => $config{cgiauthurl},
-                       do => "edit", page => $params{page}));
-       }
-}
-

 1
 1