View | Details | Raw Unified | Return to bug 36092
Collapse All | Expand All

(-)a/C4/Auth.pm (-10 / +7 lines)
Lines 291-302 sub get_template_and_user { Link Here
291
    }
291
    }
292
292
293
    my $borrowernumber;
293
    my $borrowernumber;
294
    my $patron;
294
    if ($user) {
295
    if ($user) {
295
296
296
        # It's possible for $user to be the borrowernumber if they don't have a
297
        # It's possible for $user to be the borrowernumber if they don't have a
297
        # userid defined (and are logging in through some other method, such
298
        # userid defined (and are logging in through some other method, such
298
        # as SSL certs against an email address)
299
        # as SSL certs against an email address)
299
        my $patron;
300
        $borrowernumber = getborrowernumber($user) if defined($user);
300
        $borrowernumber = getborrowernumber($user) if defined($user);
301
        if ( !defined($borrowernumber) && defined($user) ) {
301
        if ( !defined($borrowernumber) && defined($user) ) {
302
            $patron = Koha::Patrons->find( $user );
302
            $patron = Koha::Patrons->find( $user );
Lines 312-323 sub get_template_and_user { Link Here
312
            # FIXME What to do if $patron does not exist?
312
            # FIXME What to do if $patron does not exist?
313
        }
313
        }
314
314
315
        # user info
316
        $template->param( loggedinusername   => $user ); # OBSOLETE - Do not reuse this in template, use logged_in_user.userid instead
317
        $template->param( loggedinusernumber => $borrowernumber ); # FIXME Should be replaced with logged_in_user.borrowernumber
318
        $template->param( logged_in_user     => $patron );
319
        $template->param( sessionID          => $sessionID );
320
321
        if ( $in->{'type'} eq 'opac' ) {
315
        if ( $in->{'type'} eq 'opac' ) {
322
            require Koha::Virtualshelves;
316
            require Koha::Virtualshelves;
323
            my $some_private_shelves = Koha::Virtualshelves->get_some_shelves(
317
            my $some_private_shelves = Koha::Virtualshelves->get_some_shelves(
Lines 406-413 sub get_template_and_user { Link Here
406
            }
400
            }
407
        }
401
        }
408
402
409
        $template->param( sessionID => $sessionID );
410
411
        if ( $in->{'type'} eq 'opac' ){
403
        if ( $in->{'type'} eq 'opac' ){
412
            require Koha::Virtualshelves;
404
            require Koha::Virtualshelves;
413
            my $some_public_shelves = Koha::Virtualshelves->get_some_shelves(
405
            my $some_public_shelves = Koha::Virtualshelves->get_some_shelves(
Lines 631-636 sub get_template_and_user { Link Here
631
        $cookie = $cookie_mgr->replace_in_list( $cookie, $languagecookie );
623
        $cookie = $cookie_mgr->replace_in_list( $cookie, $languagecookie );
632
    }
624
    }
633
625
626
    # user info
627
    $template->param( loggedinusername   => $user ); # OBSOLETE - Do not reuse this in template, use logged_in_user.userid instead
628
    $template->param( loggedinusernumber => $borrowernumber ); # FIXME Should be replaced with logged_in_user.borrowernumber
629
    $template->param( logged_in_user     => $patron );
630
    $template->param( sessionID          => $sessionID );
631
634
    return ( $template, $borrowernumber, $cookie, $flags );
632
    return ( $template, $borrowernumber, $cookie, $flags );
635
}
633
}
636
634
637
- 

Return to bug 36092