Lines 146-159
sub get_template_and_user {
Link Here
|
146 |
my $borrowernumber; |
146 |
my $borrowernumber; |
147 |
my $insecure = C4::Context->preference('insecure'); |
147 |
my $insecure = C4::Context->preference('insecure'); |
148 |
if ($user or $insecure) { |
148 |
if ($user or $insecure) { |
|
|
149 |
require C4::Members; |
149 |
# It's possible for $user to be the borrowernumber if they don't have a |
150 |
# It's possible for $user to be the borrowernumber if they don't have a |
150 |
# userid defined (and are logging in through some other method, such |
151 |
# userid defined (and are logging in through some other method, such |
151 |
# as SSL certs against an email address) |
152 |
# as SSL certs against an email address) |
152 |
$borrowernumber = getborrowernumber($user) if defined($user); |
153 |
$borrowernumber = getborrowernumber($user) if defined($user); |
153 |
if (!defined($borrowernumber) && defined($user)) { |
154 |
if (!defined($borrowernumber) && defined($user)) { |
154 |
my $borrower = GetMember(borrowernumber => $user); |
155 |
my $borrower = C4::Members::GetMember(borrowernumber => $user); |
155 |
if ($borrower) { |
156 |
if ($borrower) { |
156 |
$borrowernumber = $user; |
157 |
$borrowernumber = $user; |
157 |
# A bit of a hack, but I don't know there's a nicer way |
158 |
# A bit of a hack, but I don't know there's a nicer way |
158 |
# to do it. |
159 |
# to do it. |
159 |
$user = $borrower->{firstname} . ' ' . $borrower->{surname}; |
160 |
$user = $borrower->{firstname} . ' ' . $borrower->{surname}; |
Lines 172-178
sub get_template_and_user {
Link Here
|
172 |
barshelvesloop => $barshelves, |
173 |
barshelvesloop => $barshelves, |
173 |
); |
174 |
); |
174 |
|
175 |
|
175 |
require C4::Members; |
|
|
176 |
my ( $borr ) = C4::Members::GetMemberDetails( $borrowernumber ); |
176 |
my ( $borr ) = C4::Members::GetMemberDetails( $borrowernumber ); |
177 |
my @bordat; |
177 |
my @bordat; |
178 |
$bordat[0] = $borr; |
178 |
$bordat[0] = $borr; |
179 |
- |
|
|