Lines 844-851
sub checkauth {
Link Here
|
844 |
$session->param('cardnumber'), $session->param('firstname'), |
844 |
$session->param('cardnumber'), $session->param('firstname'), |
845 |
$session->param('surname'), $session->param('branch'), |
845 |
$session->param('surname'), $session->param('branch'), |
846 |
$session->param('branchname'), $session->param('flags'), |
846 |
$session->param('branchname'), $session->param('flags'), |
847 |
$session->param('emailaddress'), |
847 |
$session->param('emailaddress'), $session->param('shibboleth'), |
848 |
$session->param('shibboleth') |
848 |
$session->param('register_id') |
849 |
); |
849 |
); |
850 |
C4::Context::set_shelves_userenv( 'bar', $session->param('barshelves') ); |
850 |
C4::Context::set_shelves_userenv( 'bar', $session->param('barshelves') ); |
851 |
C4::Context::set_shelves_userenv( 'pub', $session->param('pubshelves') ); |
851 |
C4::Context::set_shelves_userenv( 'pub', $session->param('pubshelves') ); |
Lines 1065-1071
sub checkauth {
Link Here
|
1065 |
C4::Context->_unset_userenv($sessionID); |
1065 |
C4::Context->_unset_userenv($sessionID); |
1066 |
} |
1066 |
} |
1067 |
my ( $borrowernumber, $firstname, $surname, $userflags, |
1067 |
my ( $borrowernumber, $firstname, $surname, $userflags, |
1068 |
$branchcode, $branchname, $emailaddress ); |
1068 |
$branchcode, $branchname, $emailaddress, $register_id ); |
1069 |
|
1069 |
|
1070 |
if ( $return == 1 ) { |
1070 |
if ( $return == 1 ) { |
1071 |
my $select = " |
1071 |
my $select = " |
Lines 1109-1114
sub checkauth {
Link Here
|
1109 |
my $library = Koha::Libraries->find($branchcode); |
1109 |
my $library = Koha::Libraries->find($branchcode); |
1110 |
$branchname = $library? $library->branchname: ''; |
1110 |
$branchname = $library? $library->branchname: ''; |
1111 |
} |
1111 |
} |
|
|
1112 |
if ( $query->param('register_id') ) { |
1113 |
$register_id = $query->param('register_id'); |
1114 |
} |
1112 |
my $branches = { map { $_->branchcode => $_->unblessed } Koha::Libraries->search }; |
1115 |
my $branches = { map { $_->branchcode => $_->unblessed } Koha::Libraries->search }; |
1113 |
if ( $type ne 'opac' and C4::Context->boolean_preference('AutoLocation') ) { |
1116 |
if ( $type ne 'opac' and C4::Context->boolean_preference('AutoLocation') ) { |
1114 |
|
1117 |
|
Lines 1150-1155
sub checkauth {
Link Here
|
1150 |
$session->param( 'lasttime', time() ); |
1153 |
$session->param( 'lasttime', time() ); |
1151 |
$session->param( 'interface', $type); |
1154 |
$session->param( 'interface', $type); |
1152 |
$session->param( 'shibboleth', $shibSuccess ); |
1155 |
$session->param( 'shibboleth', $shibSuccess ); |
|
|
1156 |
$session->param( 'register_id', $register_id ); |
1153 |
$debug and printf STDERR "AUTH_4: (%s)\t%s %s - %s\n", map { $session->param($_) } qw(cardnumber firstname surname branch); |
1157 |
$debug and printf STDERR "AUTH_4: (%s)\t%s %s - %s\n", map { $session->param($_) } qw(cardnumber firstname surname branch); |
1154 |
} |
1158 |
} |
1155 |
$session->param('cas_ticket', $cas_ticket) if $cas_ticket; |
1159 |
$session->param('cas_ticket', $cas_ticket) if $cas_ticket; |
Lines 1158-1164
sub checkauth {
Link Here
|
1158 |
$session->param('cardnumber'), $session->param('firstname'), |
1162 |
$session->param('cardnumber'), $session->param('firstname'), |
1159 |
$session->param('surname'), $session->param('branch'), |
1163 |
$session->param('surname'), $session->param('branch'), |
1160 |
$session->param('branchname'), $session->param('flags'), |
1164 |
$session->param('branchname'), $session->param('flags'), |
1161 |
$session->param('emailaddress'), $session->param('shibboleth') |
1165 |
$session->param('emailaddress'), $session->param('shibboleth'), |
|
|
1166 |
$session->param('register_id') |
1162 |
); |
1167 |
); |
1163 |
|
1168 |
|
1164 |
} |
1169 |
} |
Lines 1435-1441
sub check_api_auth {
Link Here
|
1435 |
$session->param('cardnumber'), $session->param('firstname'), |
1440 |
$session->param('cardnumber'), $session->param('firstname'), |
1436 |
$session->param('surname'), $session->param('branch'), |
1441 |
$session->param('surname'), $session->param('branch'), |
1437 |
$session->param('branchname'), $session->param('flags'), |
1442 |
$session->param('branchname'), $session->param('flags'), |
1438 |
$session->param('emailaddress') |
1443 |
$session->param('emailaddress'), $session->param('shibboleth'), |
|
|
1444 |
$session->param('register_id') |
1439 |
); |
1445 |
); |
1440 |
|
1446 |
|
1441 |
my $ip = $session->param('ip'); |
1447 |
my $ip = $session->param('ip'); |
Lines 1595-1601
sub check_api_auth {
Link Here
|
1595 |
$session->param('cardnumber'), $session->param('firstname'), |
1601 |
$session->param('cardnumber'), $session->param('firstname'), |
1596 |
$session->param('surname'), $session->param('branch'), |
1602 |
$session->param('surname'), $session->param('branch'), |
1597 |
$session->param('branchname'), $session->param('flags'), |
1603 |
$session->param('branchname'), $session->param('flags'), |
1598 |
$session->param('emailaddress') |
1604 |
$session->param('emailaddress'), $session->param('shibboleth'), |
|
|
1605 |
$session->param('register_id') |
1599 |
); |
1606 |
); |
1600 |
return ( "ok", $cookie, $sessionID ); |
1607 |
return ( "ok", $cookie, $sessionID ); |
1601 |
} else { |
1608 |
} else { |
Lines 1683-1689
sub check_cookie_auth {
Link Here
|
1683 |
$session->param('cardnumber'), $session->param('firstname'), |
1690 |
$session->param('cardnumber'), $session->param('firstname'), |
1684 |
$session->param('surname'), $session->param('branch'), |
1691 |
$session->param('surname'), $session->param('branch'), |
1685 |
$session->param('branchname'), $session->param('flags'), |
1692 |
$session->param('branchname'), $session->param('flags'), |
1686 |
$session->param('emailaddress') |
1693 |
$session->param('emailaddress'), $session->param('shibboleth'), |
|
|
1694 |
$session->param('register_id') |
1687 |
); |
1695 |
); |
1688 |
|
1696 |
|
1689 |
my $ip = $session->param('ip'); |
1697 |
my $ip = $session->param('ip'); |