my $q=shift;
my $session=shift;
- if (! defined $session->param("name") ||
+ if (! length $session->param("name") ||
! userinfo_get($session->param("name"), "regdate")) {
$session->param(postsignin => $q->query_string);
cgi_signin($q, $session);
return;
}
elsif ($form->submitted eq 'Save Preferences' && $form->validate) {
- if (defined $form->field('email')) {
- userinfo_set($user_name, 'email', $form->field('email')) ||
+ my $email = $form->field('email');
+ if (defined $email) {
+ userinfo_set($user_name, 'email', $email) ||
error("failed to set email");
}
if (defined $session->param("name")) {
my $sid=$q->param('sid');
- if (! defined $sid || $sid ne $session->id) {
+ if (! defined $sid || $sid ne $session->id || ! length $session->param("name")) {
error(gettext("Your login session has expired."));
}
}
}
# Auth hooks can sign a user in.
- if ($do ne 'signin' && ! defined $session->param("name")) {
+ if ($do ne 'signin' && ! length $session->param("name")) {
run_hooks(auth => sub {
shift->($q, $session)
});
- if (defined $session->param("name")) {
+ if (length $session->param("name")) {
# Make sure whatever user was authed is in the
# userinfo db.
if (! userinfo_get($session->param("name"), "regdate")) {
print "Content-type: text/html\n\n";
print cgitemplate(undef, gettext("Error"),
"<p class=\"error\">".gettext("Error").": $message</p>");
- die $@;
+
+ die $message;
}
1