Private GIT
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
centreon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
vlbox
centreon
Commits
bf6676c6
Commit
bf6676c6
authored
Aug 23, 2017
by
qgarnier
Committed by
Kev
Aug 30, 2017
Browse files
Options
Downloads
Patches
Plain Diff
Ref #4867
parent
e3df0899
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
www/class/centreonAuth.LDAP.class.php
+4
-4
4 additions, 4 deletions
www/class/centreonAuth.LDAP.class.php
www/class/centreonLDAP.class.php
+0
-1
0 additions, 1 deletion
www/class/centreonLDAP.class.php
with
4 additions
and
5 deletions
www/class/centreonAuth.LDAP.class.php
+
4
−
4
View file @
bf6676c6
...
@@ -272,8 +272,8 @@ class CentreonAuthLDAP
...
@@ -272,8 +272,8 @@ class CentreonAuthLDAP
$this
->
CentreonLog
->
insertLog
(
3
,
"LDAP AUTH : Update user DN for user "
.
$this
->
CentreonLog
->
insertLog
(
3
,
"LDAP AUTH : Update user DN for user "
.
html_entity_decode
(
$this
->
contactInfos
[
'contact_alias'
],
ENT_QUOTES
,
'UTF-8'
));
html_entity_decode
(
$this
->
contactInfos
[
'contact_alias'
],
ENT_QUOTES
,
'UTF-8'
));
$queryUpdateExtInfos
=
"UPDATE contact SET
$queryUpdateExtInfos
=
"UPDATE contact SET
contact_ldap_dn = '"
.
$this
->
pearDB
->
escape
(
$userDn
,
false
)
.
"',
contact_ldap_dn = '"
.
$this
->
pearDB
->
escape
(
$userDn
)
.
"',
contact_name = '"
.
$this
->
pearDB
->
escape
(
$userDisplay
,
false
)
.
"',
contact_name = '"
.
$this
->
pearDB
->
escape
(
$userDisplay
)
.
"',
contact_email = "
.
$userEmail
.
",
contact_email = "
.
$userEmail
.
",
contact_pager = "
.
$userPager
.
",
contact_pager = "
.
$userPager
.
",
ar_id = "
.
$this
->
arId
.
"
ar_id = "
.
$this
->
arId
.
"
...
@@ -313,7 +313,7 @@ class CentreonAuthLDAP
...
@@ -313,7 +313,7 @@ class CentreonAuthLDAP
contact_enable_notifications)
contact_enable_notifications)
VALUES ("
.
$tmplId
.
", '"
.
VALUES ("
.
$tmplId
.
", '"
.
$this
->
contactInfos
[
'contact_alias'
]
.
"', '"
.
$this
->
contactInfos
[
'contact_alias'
]
.
"', '"
.
$userDisplay
.
"', 'ldap', '"
.
$userDn
.
"', "
.
$this
->
arId
.
$userDisplay
.
"', 'ldap', '"
.
$this
->
pearDB
->
escape
(
$userDn
)
.
"', "
.
$this
->
arId
.
", "
.
$userEmail
.
", "
.
$userPager
.
", '1', '1', '1', '2')"
;
", "
.
$userEmail
.
", "
.
$userPager
.
", '1', '1', '1', '2')"
;
try
{
try
{
$this
->
pearDB
->
query
(
$query
);
$this
->
pearDB
->
query
(
$query
);
...
@@ -321,7 +321,7 @@ class CentreonAuthLDAP
...
@@ -321,7 +321,7 @@ class CentreonAuthLDAP
* Get the contact_id
* Get the contact_id
*/
*/
$query
=
"SELECT contact_id FROM contact
$query
=
"SELECT contact_id FROM contact
WHERE contact_ldap_dn = '"
.
$this
->
pearDB
->
escape
(
$userDn
,
false
)
.
"'"
;
WHERE contact_ldap_dn = '"
.
$this
->
pearDB
->
escape
(
$userDn
)
.
"'"
;
$res
=
$this
->
pearDB
->
query
(
$query
);
$res
=
$this
->
pearDB
->
query
(
$query
);
$row
=
$res
->
fetchRow
();
$row
=
$res
->
fetchRow
();
$contact_id
=
$row
[
'contact_id'
];
$contact_id
=
$row
[
'contact_id'
];
...
...
This diff is collapsed.
Click to expand it.
www/class/centreonLDAP.class.php
+
0
−
1
View file @
bf6676c6
...
@@ -471,7 +471,6 @@ class CentreonLDAP
...
@@ -471,7 +471,6 @@ class CentreonLDAP
if
(
trim
(
$this
->
groupSearchInfo
[
'member'
])
==
''
)
{
if
(
trim
(
$this
->
groupSearchInfo
[
'member'
])
==
''
)
{
return
array
();
return
array
();
}
}
$groupdn
=
str_replace
(
'\\'
,
'\\\\'
,
$groupdn
);
$group
=
$this
->
getEntry
(
$groupdn
,
$this
->
groupSearchInfo
[
'member'
]);
$group
=
$this
->
getEntry
(
$groupdn
,
$this
->
groupSearchInfo
[
'member'
]);
$list
=
array
();
$list
=
array
();
if
(
!
isset
(
$group
[
$this
->
groupSearchInfo
[
'member'
]]))
{
if
(
!
isset
(
$group
[
$this
->
groupSearchInfo
[
'member'
]]))
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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