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
42f545d9
Unverified
Commit
42f545d9
authored
5 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
fix(core) Fill empty catch blocks with a comment to please Sonar
issue
#6054
parent
b53c8344
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
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
plugins/admin/groups/class_ogroup.inc
+1
-0
plugins/admin/groups/class_ogroup.inc
plugins/personal/roles/class_userRoles.inc
+2
-0
plugins/personal/roles/class_userRoles.inc
with
3 additions
and
0 deletions
+3
-0
plugins/admin/groups/class_ogroup.inc
+
1
−
0
View file @
42f545d9
...
@@ -111,6 +111,7 @@ class GroupMembersAttribute extends ObjectsAttribute
...
@@ -111,6 +111,7 @@ class GroupMembersAttribute extends ObjectsAttribute
$infos
=
objects
::
infos
(
ogroup
::
$objectTypes
[
$this
->
types
[
$key
]]);
$infos
=
objects
::
infos
(
ogroup
::
$objectTypes
[
$this
->
types
[
$key
]]);
}
}
}
catch
(
NonExistingObjectTypeException
$e
)
{
}
catch
(
NonExistingObjectTypeException
$e
)
{
/* Ignore non-existing types, plugins may have been removed */
}
}
if
(
isset
(
$infos
[
'icon'
]))
{
if
(
isset
(
$infos
[
'icon'
]))
{
$img
=
$infos
[
'icon'
];
$img
=
$infos
[
'icon'
];
...
...
This diff is collapsed.
Click to expand it.
plugins/personal/roles/class_userRoles.inc
+
2
−
0
View file @
42f545d9
...
@@ -183,6 +183,7 @@ class userRoles extends simplePlugin
...
@@ -183,6 +183,7 @@ class userRoles extends simplePlugin
$g
->
getBaseObject
()
->
attributesAccess
[
'member'
]
->
searchAndRemove
(
$this
->
dn
);
$g
->
getBaseObject
()
->
attributesAccess
[
'member'
]
->
searchAndRemove
(
$this
->
dn
);
$g
->
save
();
$g
->
save
();
}
catch
(
NonExistingLdapNodeException
$e
)
{
}
catch
(
NonExistingLdapNodeException
$e
)
{
/* Ignore deleted groups */
}
}
}
}
/* Remove all roles */
/* Remove all roles */
...
@@ -192,6 +193,7 @@ class userRoles extends simplePlugin
...
@@ -192,6 +193,7 @@ class userRoles extends simplePlugin
$r
->
getBaseObject
()
->
attributesAccess
[
'roleOccupant'
]
->
searchAndRemove
(
$this
->
dn
);
$r
->
getBaseObject
()
->
attributesAccess
[
'roleOccupant'
]
->
searchAndRemove
(
$this
->
dn
);
$r
->
save
();
$r
->
save
();
}
catch
(
NonExistingLdapNodeException
$e
)
{
}
catch
(
NonExistingLdapNodeException
$e
)
{
/* Ignore deleted roles */
}
}
}
}
}
}
...
...
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