Use ltb-ldap lib for map (#118, #119)

coudot · coudot · commit 749681812074 · 2023-04-26T19:15:10.000+02:00
diff --git a/bin/map_preload_geocoding_cache.php b/bin/map_preload_geocoding_cache.php
@@ -9,7 +9,7 @@
 $size_limit_reached = false;
 
 require_once("conf/config.inc.php");
-require_once("lib/ldap.inc.php");
+require __DIR__ . '/../vendor/autoload.php';
 
 $opts = array(
     'http' => array(
@@ -33,7 +33,7 @@ function array_flatten($arr, $flat = [])
 }
 
 # Connect to LDAP
-$ldap_connection = wp_ldap_connect($ldap_url, $ldap_starttls, $ldap_binddn, $ldap_bindpw, $ldap_network_timeout);
+$ldap_connection = \Ltb\Ldap::connect($ldap_url, $ldap_starttls, $ldap_binddn, $ldap_bindpw, $ldap_network_timeout);
 
 $ldap = $ldap_connection[0];
 $result = $ldap_connection[1];
diff --git a/htdocs/map.php b/htdocs/map.php
@@ -8,7 +8,7 @@
 $size_limit_reached = false;
 
 require_once("../conf/config.inc.php");
-require_once("../lib/ldap.inc.php");
+require __DIR__ . '/../vendor/autoload.php';
 
 function array_flatten($arr, $flat = [])
 {
@@ -23,7 +23,7 @@ function array_flatten($arr, $flat = [])
 }
 
 # Connect to LDAP
-$ldap_connection = wp_ldap_connect($ldap_url, $ldap_starttls, $ldap_binddn, $ldap_bindpw, $ldap_network_timeout);
+$ldap_connection = \Ltb\Ldap::connect($ldap_url, $ldap_starttls, $ldap_binddn, $ldap_bindpw, $ldap_network_timeout);
 
 $ldap = $ldap_connection[0];
 $result = $ldap_connection[1];

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`$size_limit_reached = false;`
`9`	`9`
`10`	`10`	`require_once("../conf/config.inc.php");`
`11`		`-require_once("../lib/ldap.inc.php");`
	`11`	`+require __DIR__ . '/../vendor/autoload.php';`
`12`	`12`
`13`	`13`	`function array_flatten($arr, $flat = [])`
`14`	`14`	`{`
`@@ -23,7 +23,7 @@ function array_flatten($arr, $flat = [])`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`# Connect to LDAP`
`26`		`-$ldap_connection = wp_ldap_connect($ldap_url, $ldap_starttls, $ldap_binddn, $ldap_bindpw, $ldap_network_timeout);`
	`26`	`+$ldap_connection = \Ltb\Ldap::connect($ldap_url, $ldap_starttls, $ldap_binddn, $ldap_bindpw, $ldap_network_timeout);`
`27`	`27`
`28`	`28`	`$ldap = $ldap_connection[0];`
`29`	`29`	`$result = $ldap_connection[1];`