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
9214fc45
Verified
Commit
9214fc45
authored
4 weeks ago
by
dockx thibault
Browse files
Options
Download
Patches
Plain Diff
(setup) - fixes ldap p1
backup and some fixes in ldap.
parent
2713ed39
core-php8
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
include/class_ldap.inc
+6
-6
include/class_ldap.inc
with
6 additions
and
6 deletions
+6
-6
include/class_ldap.inc
+
6
−
6
View file @
9214fc45
...
@@ -943,7 +943,7 @@ class LDAP
...
@@ -943,7 +943,7 @@ class LDAP
if
(
!
$this
->
dn_exists
(
$cdn
))
{
if
(
!
$this
->
dn_exists
(
$cdn
))
{
$type
=
preg_replace
(
'/^([^=]+)=.*$/'
,
'\\1'
,
(
string
)
$cdn
);
$type
=
preg_replace
(
'/^([^=]+)=.*$/'
,
'\\1'
,
(
string
)
$cdn
);
$param
=
preg_replace
(
'/^[^=]+=([^,]+).*$/'
,
'\\1'
,
(
string
)
$cdn
);
$param
=
preg_replace
(
'/^[^=]+=([^,]+).*$/'
,
'\\1'
,
(
string
)
$cdn
);
$param
=
preg_replace
([
'/\\\\,/'
,
'/\\\\"/'
],
[
','
,
'"'
],
$param
);
$param
=
preg_replace
([
'/\\\\,/'
,
'/\\\\"/'
],
[
','
,
'"'
],
(
string
)
$param
);
$na
=
[];
$na
=
[];
...
@@ -1106,7 +1106,7 @@ class LDAP
...
@@ -1106,7 +1106,7 @@ class LDAP
{
{
$ret
=
[];
$ret
=
[];
$url
=
preg_replace
(
'!\?\?.*$!'
,
''
,
(
string
)
$url
);
$url
=
preg_replace
(
'!\?\?.*$!'
,
''
,
(
string
)
$url
);
$server
=
preg_replace
(
'!^([^:]+://[^/]+)/.*$!'
,
'\\1'
,
$url
);
$server
=
preg_replace
(
'!^([^:]+://[^/]+)/.*$!'
,
'\\1'
,
(
string
)
$url
);
if
(
$referrals
===
NULL
)
{
if
(
$referrals
===
NULL
)
{
$referrals
=
$this
->
referrals
;
$referrals
=
$this
->
referrals
;
...
@@ -1500,13 +1500,13 @@ class LDAP
...
@@ -1500,13 +1500,13 @@ class LDAP
/* Remove ' and " if needed */
/* Remove ' and " if needed */
$value
=
preg_replace
(
'/^[\'"]/'
,
''
,
(
string
)
$value
);
$value
=
preg_replace
(
'/^[\'"]/'
,
''
,
(
string
)
$value
);
$value
=
preg_replace
(
'/[\'"] *$/'
,
''
,
$value
);
$value
=
preg_replace
(
'/[\'"] *$/'
,
''
,
(
string
)
$value
);
/* Convert to array if $ is inside... */
/* Convert to array if $ is inside... */
if
(
preg_match
(
'/\$/'
,
$value
))
{
if
(
preg_match
(
'/\$/'
,
(
string
)
$value
))
{
$container
=
preg_split
(
'/\s*\$\s*/'
,
$value
);
$container
=
preg_split
(
'/\s*\$\s*/'
,
(
string
)
$value
);
}
else
{
}
else
{
$container
=
rtrim
(
$value
);
$container
=
rtrim
(
(
string
)
$value
);
}
}
return
$container
;
return
$container
;
...
...
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