From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Fri, 11 Jan 2013 16:20:33 +0000 (+0000)
Subject: wip
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=cgi-auth-flexible.git;a=commitdiff_plain;h=7adf4f57af7294ff5e94934d0af8b1113203f4e7

wip
---

diff --git a/cgi-auth-flexible.pm b/cgi-auth-flexible.pm
index 7f2f979..f3f1599 100644
--- a/cgi-auth-flexible.pm
+++ b/cgi-auth-flexible.pm
@@ -143,7 +143,7 @@ sub gen_plain_login_form ($$) {
                      ' name="'.$r->{S}{password_param_name}.'"></td></tr>');
         push @form, ('<tr><td colspan="2">',
                      '<input type="submit"'.
-                     ' name="'.$r->{S}{login_submit_name}[0].'"'.
+                     ' name="'.$r->{S}{dummy_param_name_prefix}.'login"'.
                      ' value="'.$r->_gt('Login').'"></td></tr>',
                      '</table>');
         return @form;
@@ -155,7 +155,7 @@ sub gen_postmainpage_form ($$$) {
     return $r->gen_some_form($params, sub {
         my @form;
         push @form, ('<input type="submit"',
-                     ' name="'.$r->{S}{dummy_param_name}.'_submit"'.
+                     ' name="'.$r->{S}{dummy_param_name_prefix}.'submit"'.
                      ' value="'.$r->_gt('Continue').'">');
         return @form;
     });
@@ -189,13 +189,12 @@ sub new_verifier {
 	    login_form_timeout => 3600, # seconds
 	    key_rollover => 86400, # seconds
 	    assoc_param_name => 'caf_assochash',
-	    dummy_param_name => 'caf_dummy',
+	    dummy_param_name_prefix => 'caf__',
 	    cookie_name => "caf_assocsecret",
 	    password_param_name => 'password',
 	    username_param_names => [qw(username)],
 	    form_entry_size => 60,
 	    logout_param_names => [qw(caf_logout)],
-	    login_submit_name => [qw(caf_login)],
 	    loggedout_param_names => [qw(caf_loggedout)],
 	    promise_check_mutate => 0,
 	    get_param => sub { $_[0]->param($_[2]) },
@@ -616,6 +615,10 @@ sub _chain_params ($) {
 	    delete $p{$name};
 	}
     }
+    my $dummy_prefix = $r->{S}{dummy_param_name_prefix};
+    foreach my $name (grep /^$dummy_prefix/, keys %p) {
+        delete $p{$name};
+    }
     return \%p;
 }