From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 7 Jan 2013 15:47:15 +0000 (+0000)
Subject: wip, fixes
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=cgi-auth-flexible.git;a=commitdiff_plain;h=576fe12d72d1dad68a2161df0c211097b9062f4c

wip, fixes
---

diff --git a/cgi-auth-hybrid.pm b/cgi-auth-hybrid.pm
index 0617881..a5499a3 100644
--- a/cgi-auth-hybrid.pm
+++ b/cgi-auth-hybrid.pm
@@ -56,16 +56,17 @@ sub flatten_params ($) {
 #---------- 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;
 }
 
-sub get_params ($$) {
-    my ($c,$r) = @_;
+sub get_params ($) {
+    my ($r) = @_;
     my %p;
+    my $c = $r->{Cgi};
     foreach my $name ($c->param()) {
 	$p{$name} = [ $c->param($name) ];
     }
@@ -210,9 +211,9 @@ sub _dbopen ($) {
     $v->{Dbh} = $dbh;
 
     eval {
-	$r->_db_transaction(sub {
+	$v->_db_transaction(sub {
 	    $dbh->do("CREATE TABLE $v->{S}{assocdb_table} (".
-		     " associdh VARCHAR PRIMARY KEY,".
+		     " associd VARCHAR PRIMARY KEY,".
 		     " username VARCHAR,".
 		     " last INTEGER NOT NULL".
 		     ")");
@@ -229,7 +230,7 @@ sub disconnect ($) {
 }
 
 sub _db_transaction ($$) {
-    my ($r, $fn) = @_;
+    my ($v, $fn) = @_;
     my $retries = 10;
     my $rv;
     my $dbh = $v->{Dbh};