Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
digibib
deichman
Commits
b1025563
Commit
b1025563
authored
Jan 22, 2019
by
Petter Goksøyr Åsen
Browse files
koha: return user flags from hijacked get_template_and_user
parent
d9723a4b
Changes
2
Hide whitespace changes
Inline
Side-by-side
koha/Deichman/Auth.pm
View file @
b1025563
...
...
@@ -167,7 +167,7 @@ sub templateAndPermissions {
my
$auth
=
$self
->
{
session
}
->
get
("
auth
");
my
$branch
=
$self
->
{
session
}
->
get
("
branchname
")
||
$auth
->
{
user
}
->
{
branchcode
};
# session param overrides stored branch
my
$userid
=
$self
->
{
session
}
->
get
("
userid
")
||
$auth
->
{
user
}
->
{
userid
};
# session param overrides stored userid
my
$flags
=
$in
->
{
flagsrequired
};
my
$flags
=
$in
->
{
flagsrequired
};
# TODO this is unused
#use Data::Dumper; warn Dumper($auth);
my
$info
=
{};
...
...
koha/Deichman/Plack/Middleware/Session.pm
View file @
b1025563
...
...
@@ -96,14 +96,16 @@ sub call {
my
(
$args
)
=
@_
;
my
$template
=
$auth
->
templateAndPermissions
(
$args
);
my
$borrowernumber
;
my
$flags
=
{};
if
(
my
$loggedInUser
=
$session
->
param
("
auth
"))
{
$borrowernumber
=
$loggedInUser
->
{
user
}
->
{
borrowernumber
}
$borrowernumber
=
$loggedInUser
->
{
user
}
->
{
borrowernumber
};
$flags
=
C4::Auth::
getuserflags
(
$loggedInUser
->
{
user
}
->
{
flags
},
$loggedInUser
->
{
user
}
->
{
userid
},)
||
{};
}
return
(
$template
,
#$session->param("borrowernumber"),
$borrowernumber
//
$session
->
param
("
borrowernumber
"),
undef
,
# cookies should not be carried around this way
$
args
->
{
flagsrequired
},
# probably unused
$
flags
);
};
local
*
{
C4::Auth::
_get_session
}
=
sub
{
$session
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment