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
Commits
952d59e0
Commit
952d59e0
authored
8 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
Avoid a PHP error in msgPool in corner cases
parent
77408346
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
include/class_msgPool.inc
+6
-4
include/class_msgPool.inc
with
6 additions
and
4 deletions
+6
-4
include/class_msgPool.inc
+
6
−
4
View file @
952d59e0
...
@@ -691,17 +691,19 @@ class msgPool {
...
@@ -691,17 +691,19 @@ class msgPool {
_
(
'delete operation'
),
_
(
'search operation'
),
_
(
'authentication'
));
_
(
'delete operation'
),
_
(
'search operation'
),
_
(
'authentication'
));
if
(
isset
(
$typemap
[
$type
]))
{
if
(
isset
(
$typemap
[
$type
]))
{
$
headline
=
sprintf
(
_
(
'LDAP %s failed!'
),
$typemap
[
$type
]);
$
msg
=
sprintf
(
_
(
'LDAP %s failed!'
),
$typemap
[
$type
]);
}
else
{
}
else
{
$
headline
=
_
(
'LDAP operation failed!'
);
$
msg
=
_
(
'LDAP operation failed!'
);
}
}
/* Fill DN information */
/* Fill DN information */
if
(
$dn
!=
''
)
{
if
(
$dn
!=
''
)
{
$
dn_info
=
'<br/><br/><i>'
.
_
(
'Object'
)
.
':</i> '
.
$dn
;
$
msg
.
=
'<br/><br/><i>'
.
_
(
'Object'
)
.
':</i> '
.
$dn
;
}
}
return
$headline
.
$dn_info
.
'<br/><br/><i>'
.
_
(
'Error'
)
.
':</i> '
.
$error
;
$msg
.
=
'<br/><br/><i>'
.
_
(
'Error'
)
.
':</i> '
.
$error
;
return
$msg
;
}
}
/*!
/*!
...
...
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