From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 28 Mar 2013 19:53:32 +0000 (+0000)
Subject: _chain_params: make an internal-only function as seems to have little plausible exter... 
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=cgi-auth-flexible.git;a=commitdiff_plain;h=a97dc2ce6b527a510159f3445834a17d9377ca96

_chain_params: make an internal-only function as seems to have little plausible external use
---

diff --git a/caf.pod b/caf.pod
index b0fb8d4..ed4c6c9 100644
--- a/caf.pod
+++ b/caf.pod
@@ -461,15 +461,6 @@ Returns the value of the secret cookie.  CGI::Auth::Flexible sets this
 cookie in the forms generated by C<check_ok>.  You may also set it
 yourself (and indeed you must do so if you use C<check_divert>).
 
-=item C<< $authreq->chain_params() >>
-
-Returns a hash of the "relevant" parameters to this request, in a form
-used by C<url_with_query_params>.  This is all of the query parameters
-which are not related to CGI::Auth::Flexible.  The PATH_INFO from the
-request is returned as the parameter C<< '' >>.
-
-xxx why use this function
-
 =back
 
 =head OTHER FUNCTIONS AND METHODS
diff --git a/cgi-auth-flexible.pm b/cgi-auth-flexible.pm
index 4b4823a..1197f86 100644
--- a/cgi-auth-flexible.pm
+++ b/cgi-auth-flexible.pm
@@ -832,7 +832,7 @@ sub _check_divert_core ($) {
                                          " enabled.  You must enable cookies".
                                          " as we use them for login."),
                       CookieSecret => $r->_fresh_secret(),
-                      Params => $r->chain_params() })
+                      Params => $r->_chain_params() })
         }
         if (!$cookt || $cookt eq 'n' || $cookh ne $parmh) {
             $r->_db_revoke($cookh);
@@ -850,13 +850,13 @@ sub _check_divert_core ($) {
             return ({ Kind => 'LOGIN-BAD',
                       Message => $login_errormessage,
                       CookieSecret => $cooks,
-                      Params => $r->chain_params() })
+                      Params => $r->_chain_params() })
         }
 	$r->_db_record_login_ok($parmh,$username);
 	return ({ Kind => 'REDIRECT-LOGGEDIN',
 		  Message => $r->_gt("Logging in..."),
 		  CookieSecret => $cooks,
-		  Params => $r->chain_params() });
+		  Params => $r->_chain_params() });
     }
     if ($cookt eq 't') {
 	$cookt = '';
@@ -876,7 +876,7 @@ sub _check_divert_core ($) {
 	    return ({ Kind => 'LOGIN-INCOMINGLINK',
 		      Message => $r->_gt("You need to log in."),
 		      CookieSecret => $news,
-		      Params => $r->chain_params() });
+		      Params => $r->_chain_params() });
 	} else {
 	    $r->_db_revoke($parmh);
 	    return ({ Kind => 'LOGIN-FRESH',
@@ -910,7 +910,14 @@ sub _check_divert_core ($) {
     return undef;
 }
 
-sub chain_params ($) {
+sub _chain_params ($) {
+# =item C<< $authreq->_chain_params() >>
+#
+# Returns a hash of the "relevant" parameters to this request, in a form
+# used by C<url_with_query_params>.  This is all of the query parameters
+# which are not related to CGI::Auth::Flexible.  The PATH_INFO from the
+# request is returned as the parameter C<< '' >>.
+
     my ($r) = @_;
     my %p = %{ $r->_ch('get_params') };
     foreach my $pncn (keys %{ $r->{S} }) {