From 9214fc45804cdf2075a53c1dfae32bcf35492a4a Mon Sep 17 00:00:00 2001
From: Thibault Dockx <thibault.dockx@fusiondirectory.org>
Date: Mon, 10 Mar 2025 14:58:43 +0000
Subject: [PATCH] :ambulance: (setup) - fixes ldap p1
backup and some fixes in ldap.
---
include/class_ldap.inc | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/class_ldap.inc b/include/class_ldap.inc
index 5bde7ed04..f1bc05ec5 100755
--- a/include/class_ldap.inc
+++ b/include/class_ldap.inc
@@ -943,7 +943,7 @@ class LDAP
if (!$this->dn_exists($cdn)) {
$type = preg_replace('/^([^=]+)=.*$/', '\\1', (string) $cdn);
$param = preg_replace('/^[^=]+=([^,]+).*$/', '\\1', (string) $cdn);
- $param = preg_replace(['/\\\\,/','/\\\\"/'], [',','"'], $param);
+ $param = preg_replace(['/\\\\,/','/\\\\"/'], [',','"'], (string) $param);
$na = [];
@@ -1106,7 +1106,7 @@ class LDAP
{
$ret = [];
$url = preg_replace('!\?\?.*$!', '', (string) $url);
- $server = preg_replace('!^([^:]+://[^/]+)/.*$!', '\\1', $url);
+ $server = preg_replace('!^([^:]+://[^/]+)/.*$!', '\\1', (string) $url);
if ($referrals === NULL) {
$referrals = $this->referrals;
@@ -1500,13 +1500,13 @@ class LDAP
/* Remove ' and " if needed */
$value = preg_replace('/^[\'"]/', '', (string) $value);
- $value = preg_replace('/[\'"] *$/', '', $value);
+ $value = preg_replace('/[\'"] *$/', '', (string) $value);
/* Convert to array if $ is inside... */
- if (preg_match('/\$/', $value)) {
- $container = preg_split('/\s*\$\s*/', $value);
+ if (preg_match('/\$/', (string) $value)) {
+ $container = preg_split('/\s*\$\s*/', (string) $value);
} else {
- $container = rtrim($value);
+ $container = rtrim((string) $value);
}
return $container;
--
GitLab