---
C4/Context.pm | 43 ++++++++++++++++++-------------------------
1 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/C4/Context.pm b/C4/Context.pm
index 3cba0ff..ae52c21 100644
--- a/C4/Context.pm
+++ b/C4/Context.pm
@@ -854,15 +854,15 @@ sub userenv
return $context->{"userenv"}->{$var} if (defined
$context->{"userenv"}->{$var});
# insecure=1 management
if ($context->{"dbh"} && $context->preference('insecure')) {
- my %insecure;
- $insecure{flags} = '16382';
- $insecure{branchname} ='Insecure';
- $insecure{number} ='0';
- $insecure{cardnumber} ='0';
- $insecure{id} = 'insecure';
- $insecure{branch} = 'INS';
- $insecure{emailaddress} = '[EMAIL PROTECTED]';
- return \%insecure;
+ return {
+ flags=> '16382'
+ , branchname=>'Insecure'
+ , number=>'0'
+ , cardnumber=>'0'
+ , id=> 'insecure'
+ , branch=> 'INS'
+ , emailaddress=> '[EMAIL PROTECTED]'
+ };
} else {
return 0;
}
@@ -883,23 +883,16 @@ set_userenv is called in Auth.pm
#'
sub set_userenv{
- my ($usernum, $userid, $usercnum, $userfirstname, $usersurname,
$userbranch, $branchname, $userflags, $emailaddress, $branchprinter)= @_;
+ #possibly a law problem
+ my %cell;
+ @cell{qw[
+ number id cardnumber
+ firstname surname
+ branch branchname
+ flags emailaddress branchprinter
+ ]} = @_;
my $var=$context->{"activeuser"};
- my $cell = {
- "number" => $usernum,
- "id" => $userid,
- "cardnumber" => $usercnum,
- "firstname" => $userfirstname,
- "surname" => $usersurname,
-#possibly a law problem
- "branch" => $userbranch,
- "branchname" => $branchname,
- "flags" => $userflags,
- "emailaddress" => $emailaddress,
- "branchprinter" => $branchprinter
- };
- $context->{userenv}->{$var} = $cell;
- return $cell;
+ return $context->{userenv}->{$var} = \%cell;
}
sub set_shelves_userenv ($$) {
--
1.5.5.3
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha.org/mailman/listinfo/koha-patches
