chiark
/
gitweb
/
~ian
/
cgi-auth-flexible.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b317fbd
)
wip, fixes
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Mon, 7 Jan 2013 15:47:15 +0000
(15:47 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Mon, 7 Jan 2013 15:47:15 +0000
(15:47 +0000)
cgi-auth-hybrid.pm
patch
|
blob
|
history
diff --git
a/cgi-auth-hybrid.pm
b/cgi-auth-hybrid.pm
index 0617881eb1b81224a29301660c5ed3ba1fd24f46..a5499a33b4517129df489a5f7af90a6180bba190 100644
(file)
--- a/
cgi-auth-hybrid.pm
+++ b/
cgi-auth-hybrid.pm
@@
-56,16
+56,17
@@
sub flatten_params ($) {
#---------- default callbacks ----------
sub has_a_param ($$) {
#---------- default callbacks ----------
sub has_a_param ($$) {
- my ($
c,$
r,$cn) = @_;
+ my ($r,$cn) = @_;
foreach my $pn (@{ $r->{S}{$cn} }) {
return 1 if $r->_cm('get_param',$pn);
}
return 0;
}
foreach my $pn (@{ $r->{S}{$cn} }) {
return 1 if $r->_cm('get_param',$pn);
}
return 0;
}
-sub get_params ($
$
) {
- my ($
c,$
r) = @_;
+sub get_params ($) {
+ my ($r) = @_;
my %p;
my %p;
+ my $c = $r->{Cgi};
foreach my $name ($c->param()) {
$p{$name} = [ $c->param($name) ];
}
foreach my $name ($c->param()) {
$p{$name} = [ $c->param($name) ];
}
@@
-210,9
+211,9
@@
sub _dbopen ($) {
$v->{Dbh} = $dbh;
eval {
$v->{Dbh} = $dbh;
eval {
- $
r
->_db_transaction(sub {
+ $
v
->_db_transaction(sub {
$dbh->do("CREATE TABLE $v->{S}{assocdb_table} (".
$dbh->do("CREATE TABLE $v->{S}{assocdb_table} (".
- " associd
h
VARCHAR PRIMARY KEY,".
+ " associd VARCHAR PRIMARY KEY,".
" username VARCHAR,".
" last INTEGER NOT NULL".
")");
" username VARCHAR,".
" last INTEGER NOT NULL".
")");
@@
-229,7
+230,7
@@
sub disconnect ($) {
}
sub _db_transaction ($$) {
}
sub _db_transaction ($$) {
- my ($
r
, $fn) = @_;
+ my ($
v
, $fn) = @_;
my $retries = 10;
my $rv;
my $dbh = $v->{Dbh};
my $retries = 10;
my $rv;
my $dbh = $v->{Dbh};