Lines 38-43
use Koha::Checkouts;
Link Here
|
38 |
use Koha::DateUtils qw(dt_from_string); |
38 |
use Koha::DateUtils qw(dt_from_string); |
39 |
use Koha::Library::Groups; |
39 |
use Koha::Library::Groups; |
40 |
use Koha::Libraries; |
40 |
use Koha::Libraries; |
|
|
41 |
use Koha::Cash::Registers; |
41 |
use Koha::Desks; |
42 |
use Koha::Desks; |
42 |
use Koha::Patrons; |
43 |
use Koha::Patrons; |
43 |
use Koha::Patron::Consents; |
44 |
use Koha::Patron::Consents; |
Lines 868-874
sub checkauth {
Link Here
|
868 |
$session->param('branchname'), $session->param('flags'), |
869 |
$session->param('branchname'), $session->param('flags'), |
869 |
$session->param('emailaddress'), $session->param('shibboleth'), |
870 |
$session->param('emailaddress'), $session->param('shibboleth'), |
870 |
$session->param('desk_id'), $session->param('desk_name'), |
871 |
$session->param('desk_id'), $session->param('desk_name'), |
871 |
$session->param('register_id') |
872 |
$session->param('register_id'), $session->param('register_name') |
872 |
); |
873 |
); |
873 |
C4::Context::set_shelves_userenv( 'bar', $session->param('barshelves') ); |
874 |
C4::Context::set_shelves_userenv( 'bar', $session->param('barshelves') ); |
874 |
C4::Context::set_shelves_userenv( 'pub', $session->param('pubshelves') ); |
875 |
C4::Context::set_shelves_userenv( 'pub', $session->param('pubshelves') ); |
Lines 1091-1097
sub checkauth {
Link Here
|
1091 |
} |
1092 |
} |
1092 |
my ( $borrowernumber, $firstname, $surname, $userflags, |
1093 |
my ( $borrowernumber, $firstname, $surname, $userflags, |
1093 |
$branchcode, $branchname, $emailaddress, $desk_id, |
1094 |
$branchcode, $branchname, $emailaddress, $desk_id, |
1094 |
$desk_name, $register_id ); |
1095 |
$desk_name, $register_id, $register_name ); |
1095 |
|
1096 |
|
1096 |
if ( $return == 1 ) { |
1097 |
if ( $return == 1 ) { |
1097 |
my $select = " |
1098 |
my $select = " |
Lines 1142-1147
sub checkauth {
Link Here
|
1142 |
} |
1143 |
} |
1143 |
if ( $query->param('register_id') ) { |
1144 |
if ( $query->param('register_id') ) { |
1144 |
$register_id = $query->param('register_id'); |
1145 |
$register_id = $query->param('register_id'); |
|
|
1146 |
my $register = Koha::Cash::Registers->find($register_id); |
1147 |
$register_name = $register ? $register->name : ''; |
1145 |
} |
1148 |
} |
1146 |
my $branches = { map { $_->branchcode => $_->unblessed } Koha::Libraries->search }; |
1149 |
my $branches = { map { $_->branchcode => $_->unblessed } Koha::Libraries->search }; |
1147 |
if ( $type ne 'opac' and C4::Context->boolean_preference('AutoLocation') ) { |
1150 |
if ( $type ne 'opac' and C4::Context->boolean_preference('AutoLocation') ) { |
Lines 1188-1193
sub checkauth {
Link Here
|
1188 |
$session->param( 'interface', $type); |
1191 |
$session->param( 'interface', $type); |
1189 |
$session->param( 'shibboleth', $shibSuccess ); |
1192 |
$session->param( 'shibboleth', $shibSuccess ); |
1190 |
$session->param( 'register_id', $register_id ); |
1193 |
$session->param( 'register_id', $register_id ); |
|
|
1194 |
$session->param( 'register_name', $register_name ); |
1191 |
$debug and printf STDERR "AUTH_4: (%s)\t%s %s - %s\n", map { $session->param($_) } qw(cardnumber firstname surname branch); |
1195 |
$debug and printf STDERR "AUTH_4: (%s)\t%s %s - %s\n", map { $session->param($_) } qw(cardnumber firstname surname branch); |
1192 |
} |
1196 |
} |
1193 |
$session->param('cas_ticket', $cas_ticket) if $cas_ticket; |
1197 |
$session->param('cas_ticket', $cas_ticket) if $cas_ticket; |
Lines 1198-1204
sub checkauth {
Link Here
|
1198 |
$session->param('branchname'), $session->param('flags'), |
1202 |
$session->param('branchname'), $session->param('flags'), |
1199 |
$session->param('emailaddress'), $session->param('shibboleth'), |
1203 |
$session->param('emailaddress'), $session->param('shibboleth'), |
1200 |
$session->param('desk_id'), $session->param('desk_name'), |
1204 |
$session->param('desk_id'), $session->param('desk_name'), |
1201 |
$session->param('register_id') |
1205 |
$session->param('register_id'), $session->param('register_name') |
1202 |
); |
1206 |
); |
1203 |
|
1207 |
|
1204 |
} |
1208 |
} |
Lines 1478-1484
sub check_api_auth {
Link Here
|
1478 |
$session->param('branchname'), $session->param('flags'), |
1482 |
$session->param('branchname'), $session->param('flags'), |
1479 |
$session->param('emailaddress'), $session->param('shibboleth'), |
1483 |
$session->param('emailaddress'), $session->param('shibboleth'), |
1480 |
$session->param('desk_id'), $session->param('desk_name'), |
1484 |
$session->param('desk_id'), $session->param('desk_name'), |
1481 |
$session->param('register_id') |
1485 |
$session->param('register_id'), $session->param('register_name') |
1482 |
); |
1486 |
); |
1483 |
|
1487 |
|
1484 |
my $ip = $session->param('ip'); |
1488 |
my $ip = $session->param('ip'); |
Lines 1642-1648
sub check_api_auth {
Link Here
|
1642 |
$session->param('branchname'), $session->param('flags'), |
1646 |
$session->param('branchname'), $session->param('flags'), |
1643 |
$session->param('emailaddress'), $session->param('shibboleth'), |
1647 |
$session->param('emailaddress'), $session->param('shibboleth'), |
1644 |
$session->param('desk_id'), $session->param('desk_name'), |
1648 |
$session->param('desk_id'), $session->param('desk_name'), |
1645 |
$session->param('register_id') |
1649 |
$session->param('register_id'), $session->param('register_name') |
1646 |
); |
1650 |
); |
1647 |
return ( "ok", $cookie, $sessionID ); |
1651 |
return ( "ok", $cookie, $sessionID ); |
1648 |
} else { |
1652 |
} else { |
Lines 1732-1738
sub check_cookie_auth {
Link Here
|
1732 |
$session->param('branchname'), $session->param('flags'), |
1736 |
$session->param('branchname'), $session->param('flags'), |
1733 |
$session->param('emailaddress'), $session->param('shibboleth'), |
1737 |
$session->param('emailaddress'), $session->param('shibboleth'), |
1734 |
$session->param('desk_id'), $session->param('desk_name'), |
1738 |
$session->param('desk_id'), $session->param('desk_name'), |
1735 |
$session->param('register_id') |
1739 |
$session->param('register_id'), $session->param('register_name') |
1736 |
); |
1740 |
); |
1737 |
|
1741 |
|
1738 |
my $ip = $session->param('ip'); |
1742 |
my $ip = $session->param('ip'); |