Lines 295-306
sub get_template_and_user {
Link Here
|
295 |
} |
295 |
} |
296 |
|
296 |
|
297 |
my $borrowernumber; |
297 |
my $borrowernumber; |
|
|
298 |
my $patron; |
298 |
if ($user) { |
299 |
if ($user) { |
299 |
|
300 |
|
300 |
# It's possible for $user to be the borrowernumber if they don't have a |
301 |
# It's possible for $user to be the borrowernumber if they don't have a |
301 |
# userid defined (and are logging in through some other method, such |
302 |
# userid defined (and are logging in through some other method, such |
302 |
# as SSL certs against an email address) |
303 |
# as SSL certs against an email address) |
303 |
my $patron; |
|
|
304 |
$borrowernumber = getborrowernumber($user) if defined($user); |
304 |
$borrowernumber = getborrowernumber($user) if defined($user); |
305 |
if ( !defined($borrowernumber) && defined($user) ) { |
305 |
if ( !defined($borrowernumber) && defined($user) ) { |
306 |
$patron = Koha::Patrons->find( $user ); |
306 |
$patron = Koha::Patrons->find( $user ); |
Lines 316-327
sub get_template_and_user {
Link Here
|
316 |
# FIXME What to do if $patron does not exist? |
316 |
# FIXME What to do if $patron does not exist? |
317 |
} |
317 |
} |
318 |
|
318 |
|
319 |
# user info |
|
|
320 |
$template->param( loggedinusername => $user ); # OBSOLETE - Do not reuse this in template, use logged_in_user.userid instead |
321 |
$template->param( loggedinusernumber => $borrowernumber ); # FIXME Should be replaced with logged_in_user.borrowernumber |
322 |
$template->param( logged_in_user => $patron ); |
323 |
$template->param( sessionID => $sessionID ); |
324 |
|
325 |
if ( $in->{'type'} eq 'opac' ) { |
319 |
if ( $in->{'type'} eq 'opac' ) { |
326 |
require Koha::Virtualshelves; |
320 |
require Koha::Virtualshelves; |
327 |
my $some_private_shelves = Koha::Virtualshelves->get_some_shelves( |
321 |
my $some_private_shelves = Koha::Virtualshelves->get_some_shelves( |
Lines 410-417
sub get_template_and_user {
Link Here
|
410 |
} |
404 |
} |
411 |
} |
405 |
} |
412 |
|
406 |
|
413 |
$template->param( sessionID => $sessionID ); |
|
|
414 |
|
415 |
if ( $in->{'type'} eq 'opac' ){ |
407 |
if ( $in->{'type'} eq 'opac' ){ |
416 |
require Koha::Virtualshelves; |
408 |
require Koha::Virtualshelves; |
417 |
my $some_public_shelves = Koha::Virtualshelves->get_some_shelves( |
409 |
my $some_public_shelves = Koha::Virtualshelves->get_some_shelves( |
Lines 643-648
sub get_template_and_user {
Link Here
|
643 |
$cookie = $cookie_mgr->replace_in_list( $cookie, $languagecookie ); |
635 |
$cookie = $cookie_mgr->replace_in_list( $cookie, $languagecookie ); |
644 |
} |
636 |
} |
645 |
|
637 |
|
|
|
638 |
# user info |
639 |
$template->param( loggedinusername => $user ); # OBSOLETE - Do not reuse this in template, use logged_in_user.userid instead |
640 |
$template->param( loggedinusernumber => $borrowernumber ); # FIXME Should be replaced with logged_in_user.borrowernumber |
641 |
$template->param( logged_in_user => $patron ); |
642 |
$template->param( sessionID => $sessionID ); |
643 |
|
646 |
if ( $in->{query}->param('invalid_csrf_token') ) { |
644 |
if ( $in->{query}->param('invalid_csrf_token') ) { |
647 |
Koha::Logger->get->debug("The form submission failed (Wrong CSRF token)."); |
645 |
Koha::Logger->get->debug("The form submission failed (Wrong CSRF token)."); |
648 |
C4::Output::output_and_exit( $in->{query}, $cookie, $template, 'wrong_csrf_token' ); |
646 |
C4::Output::output_and_exit( $in->{query}, $cookie, $template, 'wrong_csrf_token' ); |
649 |
- |
|
|