calendar: Fix month wraparound error that broke in December.

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

diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
index 336eb793a2a1cc7e3da89e0dfd9728abc80601e3..127c321f0491978c9b88760685963f785cd1062e 100644 (file)
--- a/IkiWiki/Plugin/httpauth.pm
+++ b/IkiWiki/Plugin/httpauth.pm
@@ -4,19 +4,39 @@ package IkiWiki::Plugin::httpauth;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 3.00;
 
-sub import { #{{{
-       hook(type => "auth", id => "skeleton", call => \&auth);
-} # }}}
+sub import {
+       hook(type => "getsetup", id => "httpauth", call => \&getsetup);
+       hook(type => "auth", id => "httpauth", call => \&auth);
+}
 
-sub auth ($$) { #{{{
+sub getsetup () {
+       return
+               plugin => {
+                       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 ($$) {
        my $cgi=shift;
        my $session=shift;
 
        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