our @EXPORT_OK;
use DBI;
-use CGI;
+use CGI qw/escapeHTML/;
use Locale::gettext;
use URI;
+use Data::Dumper;
#---------- public utilities ----------
gen_login_form => \&gen_plain_login_form,
gen_login_link => \&gen_plain_login_link,
gettext => sub { gettext($_[2]); },
+ print => sub { print $_[2] or die $!; },
},
Dbh => undef,
};
my $retries = 10;
my $rv;
my $dbh = $v->{Dbh};
+print STDERR "DT entry\n";
for (;;) {
+print STDERR "DT loop\n";
if (!eval {
$rv = $fn->();
+print STDERR "DT fn ok\n";
1;
}) {
+print STDERR "DT fn error\n";
{ local ($@); $dbh->rollback(); }
+print STDERR "DT fn throwing\n";
die $@;
}
+print STDERR "DT fn eval ok\n";
if (eval {
$dbh->commit();
+print STDERR "DT commit ok\n";
1;
}) {
+print STDERR "DT commit eval ok $rv\n";
return $rv;
}
+print STDERR "DT commit throw?\n";
die $@ if !--$retries;
+print STDERR "DT loop again\n";
}
}
sub _ch ($$@) { # calls an application hook
my ($r,$methname, @args) = @_;
my $methfunc = $r->{S}{$methname};
+ die "$methname ?" unless $methfunc;
return $methfunc->($r->{Cgi}, $r, @args);
}
sub construct_cookie ($$$) {
my ($r, $cookv) = @_;
return undef unless $cookv;
- return $r->{Cgi}->cookie(-name => $r->{S}{cookie_name},
+ my $c = $r->{Cgi};
+ my $cookt = $c->cookie(-name => $r->{S}{cookie_name},
-value => $cookv,
-path => $r->{S}{cookie_path},
-domain => $r->_ch('get_cookie_domain'),
-expires => '+'.$r->{S}{login_timeout}.'s',
-secure => $r->{S}{encrypted_only});
+print STDERR "CC $r $c $cookv $cookt\n";
+ return $cookt;
}
# pages/param-sets are
die unless $cookv eq $parmv;
$r->{Assoc} = $cookv;
$r->{UserOK} = $cooku;
+ print STDERR "C-D-C OK\n";
return undef;
}
sub check_divert ($) {
my ($r) = @_;
- my $divert;
if (exists $r->{Divert}) {
return $r->{Divert};
}
my $dbh = $r->{Dbh};
$r->{Divert} = $r->_db_transaction(sub { $r->_check_divert_core(); });
$dbh->commit();
- return $divert;
+ print STDERR Dumper($r->{Divert});
+ return $r->{Divert};
}
sub get_divert ($) {
die $kind;
}
- $r->_print($r->_ch('start_html',$title),
+ $r->_print($r->{Cgi}->header('text/html'),
+ $r->_ch('gen_start_html',$title),
@body,
- $r->_ch('end_html'));
+ $r->_ch('gen_end_html'));
return 0;
}
sub secret_cookie ($) {
my ($r) = @_;
- return $r->construct_cookie($r->secret_val());
+#print STDERR "SC\n";
+ my $cookv = $r->construct_cookie($r->secret_val());
+#print STDERR "SC=$cookv\n";
+ return $cookv;
}
__END__