Lines 29-34
use C4::Context;
Link Here
|
29 |
use C4::Templates; # to get the template |
29 |
use C4::Templates; # to get the template |
30 |
use C4::Languages; |
30 |
use C4::Languages; |
31 |
use C4::Branch; # GetBranches |
31 |
use C4::Branch; # GetBranches |
|
|
32 |
use C4::Desks; |
32 |
use C4::Search::History; |
33 |
use C4::Search::History; |
33 |
use Koha; |
34 |
use Koha; |
34 |
use Koha::AuthUtils qw(hash_password); |
35 |
use Koha::AuthUtils qw(hash_password); |
Lines 405-410
sub get_template_and_user {
Link Here
|
405 |
IntranetmainUserblock => C4::Context->preference("IntranetmainUserblock"), |
406 |
IntranetmainUserblock => C4::Context->preference("IntranetmainUserblock"), |
406 |
LibraryName => C4::Context->preference("LibraryName"), |
407 |
LibraryName => C4::Context->preference("LibraryName"), |
407 |
LoginBranchname => ( C4::Context->userenv ? C4::Context->userenv->{"branchname"} : undef ), |
408 |
LoginBranchname => ( C4::Context->userenv ? C4::Context->userenv->{"branchname"} : undef ), |
|
|
409 |
LoginDeskname => ( C4::Context->userenv ? C4::Context->userenv->{"deskname"} : undef ), |
408 |
advancedMARCEditor => C4::Context->preference("advancedMARCEditor"), |
410 |
advancedMARCEditor => C4::Context->preference("advancedMARCEditor"), |
409 |
canreservefromotherbranches => C4::Context->preference('canreservefromotherbranches'), |
411 |
canreservefromotherbranches => C4::Context->preference('canreservefromotherbranches'), |
410 |
intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"), |
412 |
intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"), |
Lines 425-431
sub get_template_and_user {
Link Here
|
425 |
UseKohaPlugins => C4::Context->preference('UseKohaPlugins'), |
427 |
UseKohaPlugins => C4::Context->preference('UseKohaPlugins'), |
426 |
UseCourseReserves => C4::Context->preference("UseCourseReserves"), |
428 |
UseCourseReserves => C4::Context->preference("UseCourseReserves"), |
427 |
useDischarge => C4::Context->preference('useDischarge'), |
429 |
useDischarge => C4::Context->preference('useDischarge'), |
428 |
); |
430 |
); |
|
|
431 |
if ( C4::Context->userenv ? C4::Context->userenv->{"branch"} : undef) { |
432 |
my $desksaref = GetDesks(C4::Context->userenv->{"branch"}); |
433 |
if ($#$desksaref > -1) { |
434 |
$template->param( |
435 |
LoginDeskcode => ( C4::Context->userenv->{"deskcode"} ), |
436 |
LoginDeskname => ( C4::Context->userenv->{"deskname"} ), |
437 |
HasDesk => (1), |
438 |
); |
439 |
} |
440 |
else { |
441 |
$template->param( |
442 |
HasDesk => ( undef ), |
443 |
); |
444 |
} |
445 |
} |
429 |
} |
446 |
} |
430 |
else { |
447 |
else { |
431 |
warn "template type should be OPAC, here it is=[" . $in->{'type'} . "]" unless ( $in->{'type'} eq 'opac' ); |
448 |
warn "template type should be OPAC, here it is=[" . $in->{'type'} . "]" unless ( $in->{'type'} eq 'opac' ); |
Lines 474-479
sub get_template_and_user {
Link Here
|
474 |
LibraryName => "" . C4::Context->preference("LibraryName"), |
491 |
LibraryName => "" . C4::Context->preference("LibraryName"), |
475 |
LibraryNameTitle => "" . $LibraryNameTitle, |
492 |
LibraryNameTitle => "" . $LibraryNameTitle, |
476 |
LoginBranchname => C4::Context->userenv ? C4::Context->userenv->{"branchname"} : "", |
493 |
LoginBranchname => C4::Context->userenv ? C4::Context->userenv->{"branchname"} : "", |
|
|
494 |
Logindeskname => C4::Context->userenv ? C4::Context->userenv->{"deskname"} : "", |
477 |
OPACAmazonCoverImages => C4::Context->preference("OPACAmazonCoverImages"), |
495 |
OPACAmazonCoverImages => C4::Context->preference("OPACAmazonCoverImages"), |
478 |
OPACFRBRizeEditions => C4::Context->preference("OPACFRBRizeEditions"), |
496 |
OPACFRBRizeEditions => C4::Context->preference("OPACFRBRizeEditions"), |
479 |
OpacHighlightedWords => C4::Context->preference("OpacHighlightedWords"), |
497 |
OpacHighlightedWords => C4::Context->preference("OpacHighlightedWords"), |
Lines 762-768
sub checkauth {
Link Here
|
762 |
$session->param('surname'), $session->param('branch'), |
780 |
$session->param('surname'), $session->param('branch'), |
763 |
$session->param('branchname'), $session->param('flags'), |
781 |
$session->param('branchname'), $session->param('flags'), |
764 |
$session->param('emailaddress'), $session->param('branchprinter'), |
782 |
$session->param('emailaddress'), $session->param('branchprinter'), |
765 |
$session->param('persona'), $session->param('shibboleth') |
783 |
$session->param('persona'), $session->param('shibboleth'), |
|
|
784 |
$session->param('deskcode'), $session->param('deskname') |
766 |
); |
785 |
); |
767 |
C4::Context::set_shelves_userenv( 'bar', $session->param('barshelves') ); |
786 |
C4::Context::set_shelves_userenv( 'bar', $session->param('barshelves') ); |
768 |
C4::Context::set_shelves_userenv( 'pub', $session->param('pubshelves') ); |
787 |
C4::Context::set_shelves_userenv( 'pub', $session->param('pubshelves') ); |
Lines 986-992
sub checkauth {
Link Here
|
986 |
C4::Context->_unset_userenv($sessionID); |
1005 |
C4::Context->_unset_userenv($sessionID); |
987 |
} |
1006 |
} |
988 |
my ( $borrowernumber, $firstname, $surname, $userflags, |
1007 |
my ( $borrowernumber, $firstname, $surname, $userflags, |
989 |
$branchcode, $branchname, $branchprinter, $emailaddress ); |
1008 |
$branchcode, $branchname, $branchprinter, $emailaddress, |
|
|
1009 |
$deskcode, $deskname); |
990 |
|
1010 |
|
991 |
if ( $return == 1 ) { |
1011 |
if ( $return == 1 ) { |
992 |
my $select = " |
1012 |
my $select = " |
Lines 1062-1067
sub checkauth {
Link Here
|
1062 |
$session->param( 'surname', $surname ); |
1082 |
$session->param( 'surname', $surname ); |
1063 |
$session->param( 'branch', $branchcode ); |
1083 |
$session->param( 'branch', $branchcode ); |
1064 |
$session->param( 'branchname', $branchname ); |
1084 |
$session->param( 'branchname', $branchname ); |
|
|
1085 |
$session->param( 'deskcode', $deskcode ); |
1086 |
$session->param( 'deskname', $deskname ); |
1065 |
$session->param( 'flags', $userflags ); |
1087 |
$session->param( 'flags', $userflags ); |
1066 |
$session->param( 'emailaddress', $emailaddress ); |
1088 |
$session->param( 'emailaddress', $emailaddress ); |
1067 |
$session->param( 'ip', $session->remote_addr() ); |
1089 |
$session->param( 'ip', $session->remote_addr() ); |
Lines 1080-1085
sub checkauth {
Link Here
|
1080 |
$session->param( 'surname', C4::Context->config('user') ); |
1102 |
$session->param( 'surname', C4::Context->config('user') ); |
1081 |
$session->param( 'branch', 'NO_LIBRARY_SET' ); |
1103 |
$session->param( 'branch', 'NO_LIBRARY_SET' ); |
1082 |
$session->param( 'branchname', 'NO_LIBRARY_SET' ); |
1104 |
$session->param( 'branchname', 'NO_LIBRARY_SET' ); |
|
|
1105 |
$session->param( 'deskcode', 'NO_DESK_SET' ); |
1106 |
$session->param( 'deskname', 'NO_DESK_SET' ); |
1083 |
$session->param( 'flags', 1 ); |
1107 |
$session->param( 'flags', 1 ); |
1084 |
$session->param( 'emailaddress', C4::Context->preference('KohaAdminEmailAddress') ); |
1108 |
$session->param( 'emailaddress', C4::Context->preference('KohaAdminEmailAddress') ); |
1085 |
$session->param( 'ip', $session->remote_addr() ); |
1109 |
$session->param( 'ip', $session->remote_addr() ); |
Lines 1094-1100
sub checkauth {
Link Here
|
1094 |
$session->param('surname'), $session->param('branch'), |
1118 |
$session->param('surname'), $session->param('branch'), |
1095 |
$session->param('branchname'), $session->param('flags'), |
1119 |
$session->param('branchname'), $session->param('flags'), |
1096 |
$session->param('emailaddress'), $session->param('branchprinter'), |
1120 |
$session->param('emailaddress'), $session->param('branchprinter'), |
1097 |
$session->param('persona'), $session->param('shibboleth') |
1121 |
$session->param('persona'), $session->param('shibboleth'), |
|
|
1122 |
$session->param('deskcode'), $session->param('deskname') |
1098 |
); |
1123 |
); |
1099 |
|
1124 |
|
1100 |
} |
1125 |
} |
Lines 1341-1347
sub check_api_auth {
Link Here
|
1341 |
$session->param('cardnumber'), $session->param('firstname'), |
1366 |
$session->param('cardnumber'), $session->param('firstname'), |
1342 |
$session->param('surname'), $session->param('branch'), |
1367 |
$session->param('surname'), $session->param('branch'), |
1343 |
$session->param('branchname'), $session->param('flags'), |
1368 |
$session->param('branchname'), $session->param('flags'), |
1344 |
$session->param('emailaddress'), $session->param('branchprinter') |
1369 |
$session->param('emailaddress'), $session->param('branchprinter'), |
|
|
1370 |
$session->param('persona'), $session->param('shibboleth'), |
1371 |
$session->param('deskcode'), $session->param('deskname') |
1345 |
); |
1372 |
); |
1346 |
|
1373 |
|
1347 |
my $ip = $session->param('ip'); |
1374 |
my $ip = $session->param('ip'); |
Lines 1428-1434
sub check_api_auth {
Link Here
|
1428 |
my ( |
1455 |
my ( |
1429 |
$borrowernumber, $firstname, $surname, |
1456 |
$borrowernumber, $firstname, $surname, |
1430 |
$userflags, $branchcode, $branchname, |
1457 |
$userflags, $branchcode, $branchname, |
1431 |
$branchprinter, $emailaddress |
1458 |
$branchprinter, $emailaddress, $deskcode, |
|
|
1459 |
$deskname |
1432 |
); |
1460 |
); |
1433 |
my $sth = |
1461 |
my $sth = |
1434 |
$dbh->prepare( |
1462 |
$dbh->prepare( |
Lines 1489-1494
sub check_api_auth {
Link Here
|
1489 |
$session->param( 'surname', $surname ); |
1517 |
$session->param( 'surname', $surname ); |
1490 |
$session->param( 'branch', $branchcode ); |
1518 |
$session->param( 'branch', $branchcode ); |
1491 |
$session->param( 'branchname', $branchname ); |
1519 |
$session->param( 'branchname', $branchname ); |
|
|
1520 |
$session->param( 'deskcode', $deskcode ); |
1521 |
$session->param( 'deskname', $deskname ); |
1492 |
$session->param( 'flags', $userflags ); |
1522 |
$session->param( 'flags', $userflags ); |
1493 |
$session->param( 'emailaddress', $emailaddress ); |
1523 |
$session->param( 'emailaddress', $emailaddress ); |
1494 |
$session->param( 'ip', $session->remote_addr() ); |
1524 |
$session->param( 'ip', $session->remote_addr() ); |
Lines 1503-1508
sub check_api_auth {
Link Here
|
1503 |
$session->param( 'surname', C4::Context->config('user') ); |
1533 |
$session->param( 'surname', C4::Context->config('user') ); |
1504 |
$session->param( 'branch', 'NO_LIBRARY_SET' ); |
1534 |
$session->param( 'branch', 'NO_LIBRARY_SET' ); |
1505 |
$session->param( 'branchname', 'NO_LIBRARY_SET' ); |
1535 |
$session->param( 'branchname', 'NO_LIBRARY_SET' ); |
|
|
1536 |
$session->param( 'deskcode', 'NO_DESK_SET' ); |
1537 |
$session->param( 'deskname', 'NO_DESK_SET' ); |
1506 |
$session->param( 'flags', 1 ); |
1538 |
$session->param( 'flags', 1 ); |
1507 |
$session->param( 'emailaddress', C4::Context->preference('KohaAdminEmailAddress') ); |
1539 |
$session->param( 'emailaddress', C4::Context->preference('KohaAdminEmailAddress') ); |
1508 |
$session->param( 'ip', $session->remote_addr() ); |
1540 |
$session->param( 'ip', $session->remote_addr() ); |
Lines 1513-1519
sub check_api_auth {
Link Here
|
1513 |
$session->param('cardnumber'), $session->param('firstname'), |
1545 |
$session->param('cardnumber'), $session->param('firstname'), |
1514 |
$session->param('surname'), $session->param('branch'), |
1546 |
$session->param('surname'), $session->param('branch'), |
1515 |
$session->param('branchname'), $session->param('flags'), |
1547 |
$session->param('branchname'), $session->param('flags'), |
1516 |
$session->param('emailaddress'), $session->param('branchprinter') |
1548 |
$session->param('emailaddress'), $session->param('branchprinter'), |
|
|
1549 |
$session->param('persona'), $session->param('shibboleth'), |
1550 |
$session->param('deskcode'), $session->param('deskname'), |
1517 |
); |
1551 |
); |
1518 |
return ( "ok", $cookie, $sessionID ); |
1552 |
return ( "ok", $cookie, $sessionID ); |
1519 |
} else { |
1553 |
} else { |
Lines 1594-1600
sub check_cookie_auth {
Link Here
|
1594 |
$session->param('cardnumber'), $session->param('firstname'), |
1628 |
$session->param('cardnumber'), $session->param('firstname'), |
1595 |
$session->param('surname'), $session->param('branch'), |
1629 |
$session->param('surname'), $session->param('branch'), |
1596 |
$session->param('branchname'), $session->param('flags'), |
1630 |
$session->param('branchname'), $session->param('flags'), |
1597 |
$session->param('emailaddress'), $session->param('branchprinter') |
1631 |
$session->param('emailaddress'), $session->param('branchprinter'), |
|
|
1632 |
$session->param('persona'), $session->param('shibboleth'), |
1633 |
$session->param('deskcode'), $session->param('deskname'), |
1598 |
); |
1634 |
); |
1599 |
|
1635 |
|
1600 |
my $ip = $session->param('ip'); |
1636 |
my $ip = $session->param('ip'); |