From: Ian Jackson Date: Fri, 28 Dec 2012 12:42:24 +0000 (+0000) Subject: wip, before remove gettext_from_text_domain X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=4c4f297e0af6d1eae07dfd8f2f61858a1f13b064;p=cgi-auth-flexible.git wip, before remove gettext_from_text_domain --- diff --git a/cgi-auth-hybrid.pm b/cgi-auth-hybrid.pm index f8c74ae..f21a026 100644 --- a/cgi-auth-hybrid.pm +++ b/cgi-auth-hybrid.pm @@ -308,7 +308,7 @@ fixme needs wrapping with something to make and commit a transaction die unless $parmt; $r->_db_revoke($cookv); $r->_db_revoke($parmv); - return ({ Kind => 'REDIRECT/LOGGEDOUT', + return ({ Kind => 'REDIRECT-LOGGEDOUT', Message => "Logging out...", Cookie => '', Params => [ ] }); @@ -317,7 +317,7 @@ fixme needs wrapping with something to make and commit a transaction die unless $meth eq 'GET'; die unless $cookt; die unless $parmt; - return ({ Kind => 'SMALLPAGE/LOGGEDOUT', + return ({ Kind => 'SMALLPAGE-LOGGEDOUT', Message => "You have been logged out.", Cookie => '', Params => [ ] }); @@ -483,7 +483,7 @@ sub check_ok ($) { my $cookie = $divert->{Cookie}; my $params = $divert->{Params}; - if ($kind =~ m#^REDIRECT/#) { + if ($kind =~ m/^REDIRECT-/) { # for redirects, we honour stored NextParams and SetCookie, # as we would for non-divert if ($divert_kind eq 'REDIRECT-LOGGEDOUT') { @@ -498,7 +498,7 @@ sub check_ok ($) { $r->_ch('do_redirect')($new_url, $cookie); return 0; } - + if ($kind =~ m/ if (defined $cookie) { $r->_ch('header_out')($cookie);