Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
fusiondirectory
fusiondirectory
Commits
e600b58f
Unverified
Commit
e600b58f
authored
5 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
fix(acls) Fix menu building when ACL for all is given on single object
issue
#5531
parent
b9e019b3
dev
6342-update-the-locales-for-1-5
6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen
6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account
6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock
6378-orcid-test-method-is-wrong-and-break-orcid-saving
core-php8
master
fusiondirectory-1.5
fusiondirectory-1.4
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
include/class_userinfo.inc
+4
-3
include/class_userinfo.inc
with
4 additions
and
3 deletions
+4
-3
include/class_userinfo.inc
+
4
−
3
View file @
e600b58f
...
@@ -687,13 +687,13 @@ class userinfo
...
@@ -687,13 +687,13 @@ class userinfo
* Extract all departments that are accessible (direct or 'on the way' to an
* Extract all departments that are accessible (direct or 'on the way' to an
* accessible department)
* accessible department)
*
*
* \param string $module The module
* \param string
|array
$module The module
*
*
* \param bool $skip_self_acls FALSE
* \param bool $skip_self_acls FALSE
*
*
* \return array Return all accessible departments
* \return array Return all accessible departments
*/
*/
function
get_module_departments
(
$module
,
$skip_self_acls
=
FALSE
)
function
get_module_departments
(
$module
,
bool
$skip_self_acls
=
FALSE
)
:
array
{
{
global
$config
;
global
$config
;
/* If we are forced to skip ACLs checks for the current user
/* If we are forced to skip ACLs checks for the current user
...
@@ -730,7 +730,8 @@ class userinfo
...
@@ -730,7 +730,8 @@ class userinfo
if
(
$skip_self_acls
&&
isset
(
$data
[
'0'
])
&&
(
strpos
(
$data
[
'0'
],
"s"
)
!==
FALSE
))
{
if
(
$skip_self_acls
&&
isset
(
$data
[
'0'
])
&&
(
strpos
(
$data
[
'0'
],
"s"
)
!==
FALSE
))
{
continue
;
continue
;
}
}
if
(
preg_match
(
"/^"
.
preg_quote
(
$mod
,
'/'
)
.
"/"
,
$cat
))
{
if
(
preg_match
(
'/^'
.
preg_quote
(
$mod
,
'/'
)
.
'/'
,
$cat
)
||
(
$cat
===
'all'
))
{
/* $cat starts with $mod (example: cat=user/user and mod=user) or cat is 'all' */
$found
=
TRUE
;
$found
=
TRUE
;
break
;
break
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets