|
Lines 1030-1036
sub checkauth {
Link Here
|
| 1030 |
unless ($shibSuccess) { |
1030 |
unless ($shibSuccess) { |
| 1031 |
if ( $cas && $query->param('ticket') ) { |
1031 |
if ( $cas && $query->param('ticket') ) { |
| 1032 |
my $retuserid; |
1032 |
my $retuserid; |
| 1033 |
( $return, $cardnumber, $retuserid, $cas_ticket ) = |
1033 |
my $patron; |
|
|
1034 |
( $return, $cardnumber, $retuserid, $patron, $cas_ticket ) = |
| 1034 |
checkpw( $userid, $password, $query, $type ); |
1035 |
checkpw( $userid, $password, $query, $type ); |
| 1035 |
$userid = $retuserid; |
1036 |
$userid = $retuserid; |
| 1036 |
$info{'invalidCasLogin'} = 1 unless ($return); |
1037 |
$info{'invalidCasLogin'} = 1 unless ($return); |
|
Lines 1098-1105
sub checkauth {
Link Here
|
| 1098 |
&& $q_userid eq C4::Context->preference('AutoSelfCheckID') ) |
1099 |
&& $q_userid eq C4::Context->preference('AutoSelfCheckID') ) |
| 1099 |
) |
1100 |
) |
| 1100 |
{ |
1101 |
{ |
|
|
1102 |
my $patron; |
| 1101 |
|
1103 |
|
| 1102 |
( $return, $cardnumber, $retuserid, $cas_ticket ) = |
1104 |
( $return, $cardnumber, $retuserid, $patron, $cas_ticket ) = |
| 1103 |
checkpw( $q_userid, $password, $query, $type ); |
1105 |
checkpw( $q_userid, $password, $query, $type ); |
| 1104 |
$userid = $retuserid if ($retuserid); |
1106 |
$userid = $retuserid if ($retuserid); |
| 1105 |
$info{'invalid_username_or_password'} = 1 unless ($return); |
1107 |
$info{'invalid_username_or_password'} = 1 unless ($return); |
|
Lines 1597-1603
sub check_api_auth {
Link Here
|
| 1597 |
return ( "failed", undef, undef ); |
1599 |
return ( "failed", undef, undef ); |
| 1598 |
} |
1600 |
} |
| 1599 |
my $newuserid; |
1601 |
my $newuserid; |
| 1600 |
( $return, $cardnumber, $newuserid, $cas_ticket ) = checkpw( $userid, $password, $query ); |
1602 |
my $patron; |
|
|
1603 |
( $return, $cardnumber, $newuserid, $patron, $cas_ticket ) = checkpw( $userid, $password, $query ); |
| 1601 |
} |
1604 |
} |
| 1602 |
|
1605 |
|
| 1603 |
if ( $return and haspermission( $userid, $flagsrequired ) ) { |
1606 |
if ( $return and haspermission( $userid, $flagsrequired ) ) { |
| 1604 |
- |
|
|