Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
fusiondirectory
fusiondirectory
Commits
dc295480
Commit
dc295480
authored
Oct 27, 2016
by
Côme Chilliet
Browse files
Fixes
#5234
Force Config object update after FD Web setup
parent
eaaa02fe
Changes
2
Hide whitespace changes
Inline
Side-by-side
include/class_config.inc
View file @
dc295480
...
...
@@ -486,25 +486,26 @@ class config {
}
/* Check that configuration is in LDAP, check that no plugin got installed since last configuration update */
function
checkLdapConfig
()
function
checkLdapConfig
(
$forceReload
=
FALSE
)
{
global
$ui
;
$ldap
=
$this
->
get_ldap_link
();
$dn
=
CONFIGRDN
.
$this
->
current
[
'BASE'
];
$reload
=
TRUE
;
$ldap
->
cat
(
$dn
,
array
(
'fusionConfigMd5'
));
if
(
$attrs
=
$ldap
->
fetch
())
{
if
(
isset
(
$attrs
[
'fusionConfigMd5'
][
0
])
&&
(
$attrs
[
'fusionConfigMd5'
][
0
]
==
md5_file
(
CACHE_DIR
.
"/"
.
CLASS_CACHE
)))
{
$reload
=
FALSE
;
$dn
=
CONFIGRDN
.
$this
->
current
[
'BASE'
];
if
(
!
$forceReload
)
{
$ldap
=
$this
->
get_ldap_link
();
$ldap
->
cat
(
$dn
,
array
(
'fusionConfigMd5'
));
if
(
$attrs
=
$ldap
->
fetch
())
{
if
(
isset
(
$attrs
[
'fusionConfigMd5'
][
0
])
&&
(
$attrs
[
'fusionConfigMd5'
][
0
]
==
md5_file
(
CACHE_DIR
.
'/'
.
CLASS_CACHE
)))
{
return
;
}
}
}
if
(
$reload
)
{
add_lock
(
$dn
,
$ui
->
dn
);
$config_plugin
=
objects
::
open
(
$dn
,
'configuration'
);
$config_plugin
->
save_object
();
$config_plugin
->
save
();
del_lock
(
$dn
);
}
add_lock
(
$dn
,
$ui
->
dn
);
$config_plugin
=
objects
::
open
(
$dn
,
'configuration'
);
$config_plugin
->
save_object
();
$config_plugin
->
save
();
del_lock
(
$dn
);
}
function
load_inldap_config
()
...
...
setup/class_setupStep_Finish.inc
View file @
dc295480
...
...
@@ -76,7 +76,7 @@ class Step_Finish extends setupStep
/* Now we can save LDAP config */
$config
->
loadPlist
(
$plist
);
$config
->
checkLdapConfig
();
$config
->
checkLdapConfig
(
TRUE
);
}
function
execute
()
...
...
Write
Preview
Supports
Markdown
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