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-orchestrator
Commits
5ca9c13f
Verified
Commit
5ca9c13f
authored
7 months ago
by
dockx thibault
Browse files
Options
Download
Patches
Plain Diff
Feat(Orchestrator) - small code fixes
Small code fixes.
parent
7ab2a70a
dev
61-orchestrator-lifecycle-array-supann-is-analyzed-with-static-numbering
63-orchestrator-mail-controller-format-of-mail-text-and-signature-are-not-utf8-usage-of-accents-is
70-create-unitests-for-orchestrator
73-orchestrator-create-a-librabry-in-core-orchestrator
78-redesign-audit-class
79-redesign-mail
80-redesign-notifications-class
81-redesign-reminders-class
82-redesign-lifecycle-class
89-orchestrator-lifecycle-adaptation-to-regex-supann-selection
main
revert-55863b23
1.1
2 merge requests
!72
Releasing Fusiondirectory Orchestrator 1.1
,
!60
Resolve "[Orchestrator] - Notifications must be updated to be aware of supannStatus values"
Pipeline
#29699
passed with stages
in 1 minute and 3 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
plugins/tasks/Notifications.php
+6
-6
plugins/tasks/Notifications.php
with
6 additions
and
6 deletions
+6
-6
plugins/tasks/Notifications.php
+
6
−
6
View file @
5ca9c13f
...
@@ -123,26 +123,26 @@ class Notifications implements EndpointInterface
...
@@ -123,26 +123,26 @@ class Notifications implements EndpointInterface
return
$result
;
return
$result
;
}
}
private
function
verifySupannState
(
array
$supannResource
,
string
$uid
)
:
bool
private
function
verifySupannState
(
array
$supannResource
,
string
$uid
):
bool
{
{
$result
=
false
;
$result
=
FALSE
;
// search the supannStates for the targeted uid by reusing getLdapTasks logic
// search the supannStates for the targeted uid by reusing getLdapTasks logic
$uidSupannStates
=
$this
->
gateway
->
getLdapTasks
(
'(objectClass=supannPerson)'
,
[
'supannRessourceEtat'
],
''
,
$uid
);
$uidSupannStates
=
$this
->
gateway
->
getLdapTasks
(
'(objectClass=supannPerson)'
,
[
'supannRessourceEtat'
],
''
,
$uid
);
$this
->
gateway
->
unsetCountKeys
(
$uidSupannStates
);
$this
->
gateway
->
unsetCountKeys
(
$uidSupannStates
);
//Construct Supann Resource State as string
//Construct Supann Resource State as string
if
(
!
empty
(
$supannResource
[
'subState'
][
0
]))
{
if
(
!
empty
(
$supannResource
[
'subState'
][
0
]))
{
$monitoredSupannState
=
'{'
.
$supannResource
[
'resource'
][
0
]
.
'}'
.
$supannResource
[
'state'
][
0
]
.
':'
.
$supannResource
[
'subState'
][
0
];
$monitoredSupannState
=
'{'
.
$supannResource
[
'resource'
][
0
]
.
'}'
.
$supannResource
[
'state'
][
0
]
.
':'
.
$supannResource
[
'subState'
][
0
];
}
else
{
}
else
{
$monitoredSupannState
=
'{'
.
$supannResource
[
'resource'
][
0
]
.
'}'
.
$supannResource
[
'state'
][
0
];
$monitoredSupannState
=
'{'
.
$supannResource
[
'resource'
][
0
]
.
'}'
.
$supannResource
[
'state'
][
0
];
}
}
foreach
(
$uidSupannStates
[
0
][
'supannressourceetat'
]
as
$supannResource
)
{
foreach
(
$uidSupannStates
[
0
][
'supannressourceetat'
]
as
$supannResource
)
{
if
(
$supannResource
===
$monitoredSupannState
)
{
if
(
$supannResource
===
$monitoredSupannState
)
{
$result
=
true
;
$result
=
TRUE
;
}
}
}
}
return
$result
;
return
$result
;
}
}
...
...
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