make decode_form_utf8 safe for arrays

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

diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
index 39edff6158e077c0c5c924ef645bb1b55bec5923..127c321f0491978c9b88760685963f785cd1062e 100644 (file)
--- a/IkiWiki/Plugin/httpauth.pm
+++ b/IkiWiki/Plugin/httpauth.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::httpauth;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 sub import {
        hook(type => "getsetup", id => "httpauth", call => \&getsetup);
 
 sub import {
        hook(type => "getsetup", id => "httpauth", call => \&getsetup);


@@ -17,6 +17,13 @@ sub getsetup () {
                        safe => 1,
                        rebuild => 0,
                },
                        safe => 1,
                        rebuild => 0,
                },

+               cgiauthurl => {
+                       type => "string",
+                       example => "http://example.com/wiki/auth/ikiwiki.cgi",
+                       description => "url to redirect to when authentication is needed",
+                       safe => 1,
+                       rebuild => 0,
+               },

 }
 
 sub auth ($$) {
 }
 
 sub auth ($$) {


@@ -26,6 +33,10 @@ sub auth ($$) {
        if (defined $cgi->remote_user()) {
                $session->param("name", $cgi->remote_user());
        }
        if (defined $cgi->remote_user()) {
                $session->param("name", $cgi->remote_user());
        }

+       elsif (defined $config{cgiauthurl}) {
+               IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string());
+               exit;
+       }

 }
 
 1
 }
 
 1