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
f58fed73
Commit
f58fed73
authored
Oct 28, 2015
by
Côme Chilliet
Browse files
Fixes
#4216
Added refresh button to ldap setup step
parent
904e91bb
Changes
2
Hide whitespace changes
Inline
Side-by-side
setup/class_setup.inc
View file @
f58fed73
...
...
@@ -147,7 +147,7 @@ class setup
}
}
/* Disable all following steps, if one step isn't comp
e
lted right now .*/
/* Disable all following steps, if one step isn't compl
e
ted right now .*/
for
(
$i
=
0
;
$i
<
$this
->
i_steps
;
$i
++
)
{
if
(
!
$this
->
o_steps
[
$i
]
->
is_completed
())
{
$this
->
disable_steps_from
(
$i
+
1
);
...
...
setup/class_setupStep_Ldap.inc
View file @
f58fed73
...
...
@@ -167,14 +167,17 @@ class Step_Ldap extends setupStep
}
else
{
$str
=
sprintf
(
_
(
"Bind as user '%s' failed!"
),
$this
->
admin
,
$this
->
connection
);
}
return
"<div style='color:red;'>"
.
$str
.
"</div>"
;
$str
.
=
'<input type="submit" name="ldap_retry" value="'
.
_
(
'Retry'
)
.
'"/>'
;
return
'<div style="color:red;">'
.
$str
.
'</div>'
;
}
else
{
if
(
empty
(
$this
->
admin
))
{
$str
=
sprintf
(
_
(
"Anonymous bind to server '%s' succeeded."
),
$this
->
connection
);
return
"<div style='color:blue;'>"
.
$str
.
"</div> <div style='color:red;'>"
.
_
(
"Please specify user and password!"
)
.
"</div>"
;
$str
.
=
'<input type="submit" name="ldap_refresh" value="'
.
_
(
'Refresh'
)
.
'"/>'
;
return
'<div style="color:blue;">'
.
$str
.
'</div> <div style="color:red;">'
.
_
(
'Please specify user and password!'
)
.
'</div>'
;
}
else
{
$str
=
sprintf
(
_
(
"Bind as user '%s' to server '%s' succeeded!"
),
$this
->
admin
,
$this
->
connection
);
return
"<div style='color:green;'>"
.
$str
.
"</div>"
;
$str
.
=
'<input type="submit" name="ldap_refresh" value="'
.
_
(
'Refresh'
)
.
'"/>'
;
return
'<div style="color:green;">'
.
$str
.
'</div>'
;
}
}
}
...
...
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