@@ -, +, @@ if auth is not required $userid = $q_userid; --- C4/Auth.pm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) --- a/C4/Auth.pm +++ a/C4/Auth.pm @@ -914,14 +914,13 @@ sub checkauth { -value => $session->id, -HttpOnly => 1 ); - $userid = $q_userid; my $pki_field = C4::Context->preference('AllowPKIAuth'); if ( !defined($pki_field) ) { print STDERR "ERROR: Missing system preference AllowPKIAuth.\n"; $pki_field = 'None'; } if ( ( $cas && $query->param('ticket') ) - || $userid + || $q_userid || ( $shib && $shib_login ) || $pki_field ne 'None' ) { @@ -935,7 +934,7 @@ sub checkauth { my $retuserid; # Do not pass password here, else shib will not be checked in checkpw. - ( $return, $cardnumber, $retuserid ) = checkpw( $dbh, $userid, undef, $query ); + ( $return, $cardnumber, $retuserid ) = checkpw( $dbh, $q_userid, undef, $query ); $userid = $retuserid; $shibSuccess = $return; $info{'invalidShibLogin'} = 1 unless ($return); @@ -986,7 +985,7 @@ sub checkauth { else { my $retuserid; ( $return, $cardnumber, $retuserid ) = - checkpw( $dbh, $userid, $password, $query, $type ); + checkpw( $dbh, $q_userid, $password, $query, $type ); $userid = $retuserid if ($retuserid); $info{'invalid_username_or_password'} = 1 unless ($return); } @@ -1131,7 +1130,7 @@ sub checkauth { $session->param( 'ip', $session->remote_addr() ); $session->param( 'sessiontype', 'anon' ); } - } # END if ( $userid = $query->param('userid') ) + } # END if ( $q_userid elsif ( $type eq "opac" ) { # if we are here this is an anonymous session; add public lists to it and a few other items... --