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
9124ca2c
Verified
Commit
9124ca2c
authored
1 month ago
by
dockx thibault
Browse files
Options
Download
Patches
Plain Diff
(setup) - fixes ldap p2
backup and some fixes in ldap.
parent
9214fc45
core-php8
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
include/class_ldap.inc
+9
-3
include/class_ldap.inc
with
9 additions
and
3 deletions
+9
-3
include/class_ldap.inc
+
9
−
3
View file @
9124ca2c
...
...
@@ -604,10 +604,17 @@ class LDAP
*
* \param $srp srp
*/
function
count
(
$srp
)
function
count
(
$srp
)
{
if
(
$this
->
hascon
)
{
if
(
$this
->
hasres
[
$srp
]
&&
!
is_bool
(
$this
->
hasres
[
$srp
]))
{
if
(
!
empty
(
$this
->
hasres
[
$srp
]))
{
// Ensure $this->sr[$srp] is a valid LDAP result
if
(
$this
->
sr
[
$srp
]
===
false
)
{
$this
->
error
=
"LDAP search returned no results"
;
logging
::
debug
(
DEBUG_LDAP
,
__LINE__
,
__FUNCTION__
,
__FILE__
,
$this
->
error
,
'count()'
);
return
0
;
// Return 0 as there are no entries
}
$rv
=
@
ldap_count_entries
(
$this
->
cid
,
$this
->
sr
[
$srp
]);
$this
->
error
=
@
ldap_error
(
$this
->
cid
);
logging
::
debug
(
DEBUG_LDAP
,
__LINE__
,
__FUNCTION__
,
__FILE__
,
$this
->
error
,
'count()'
);
...
...
@@ -624,7 +631,6 @@ class LDAP
}
}
/*!
* \brief Remove
*
...
...
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