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
d8264038
Commit
d8264038
authored
Dec 04, 2013
by
Côme Bernigaud
Committed by
Benoit Mortier
Dec 04, 2013
Browse files
Fixes: #2670 Fixed setup so that it works with new ACL format
parent
50fa504f
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
setup/class_setupStep.inc
View file @
d8264038
...
...
@@ -111,5 +111,20 @@ class setup_step extends plugin
return
$display
;
}
function
get_ldap_link
()
{
/* Establish ldap connection */
$cv
=
$this
->
parent
->
captured_values
;
$ldap_l
=
new
LDAP
(
$cv
[
'admin'
],
$cv
[
'password'
],
$cv
[
'connection'
],
FALSE
,
$cv
[
'tls'
]);
$ldap
=
new
ldapMultiplexer
(
$ldap_l
);
$ldap
->
cd
(
$cv
[
'base'
]);
return
$ldap
;
}
}
?>
setup/class_setupStep_Migrate.inc
View file @
d8264038
This diff is collapsed.
Click to expand it.
setup/class_setupStep_Schema.inc
View file @
d8264038
...
...
@@ -66,16 +66,10 @@ class Step_Schema extends setup_step
* If the root object is missing we can't read any schema informations.
* In this case we should display a message.
*/
$cv
=
$this
->
parent
->
captured_values
;
/* Establish ldap connection */
$ldap_l
=
new
LDAP
(
$cv
[
'admin'
],
$cv
[
'password'
],
$cv
[
'connection'
],
FALSE
,
$cv
[
'tls'
]);
$ldap
=
new
ldapMultiplexer
(
$ldap_l
);
$cv
=
$this
->
parent
->
captured_values
;
$ldap
=
$this
->
get_ldap_link
();
/* Check if root object exists */
$ldap
->
cd
(
$cv
[
'base'
]);
...
...
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