ne soyons pas bisnours, comme le dit [15562]

ecrire/inc/install.php

@@ -31,10 +31,17 @@ function install_fichier_connexion($nom, $texte)
 // http://doc.spip.org/@install_connexion
 function install_connexion($adr, $port, $login, $pass, $base, $type, $pref, $ldap='')
 {
+	$adr = addslashes($adr);
+	$port = addslashes($port);
+	$login = addslashes($login);
+	$pass = addslashes($pass);
+	$base = addslashes($base);
+	$type = addslashes($type);
+	$pref = addslashes($pref);
+	$ldap = addslashes($ldap);
 	return "\$GLOBALS['spip_connect_version'] = 0.7;\n"
 	. "spip_connect_db("
-	. "'$adr','$port','$login','"
-	. addcslashes($pass, "'\\") . "','$base'"
+	. "'$adr','$port','$login','$pass','$base'"
 	. ",'$type', '$pref','$ldap');\n";
 
 }

ecrire/install/etape_ldap5.php

@@ -31,21 +31,21 @@ function install_etape_ldap5_dist()
 				       . substr($conn, $p+1));
 	}
 
-	$adresse_ldap = _request('adresse_ldap');
-	$login_ldap = _request('login_ldap');
-	$pass_ldap = _request('pass_ldap');
-	$port_ldap = _request('port_ldap');
-	$tls_ldap = _request('tls_ldap');
-	$protocole_ldap = _request('protocole_ldap');
-	$base_ldap = _request('base_ldap');
-	$base_ldap_text = _request('base_ldap_text');
+	$adresse_ldap = addslashes(_request('adresse_ldap'));
+	$login_ldap = addslashes(_request('login_ldap'));
+	$pass_ldap = addslashes(_request('pass_ldap'));
+	$port_ldap = addslashes(_request('port_ldap'));
+	$tls_ldap = addslashes(_request('tls_ldap'));
+	$protocole_ldap = addslashes(_request('protocole_ldap'));
+	$base_ldap = addslashes(_request('base_ldap'));
+	$base_ldap_text = addslashes(_request('base_ldap_text'));
 
-	$conn = "\$GLOBALS['ldap_base'] = \"$base_ldap\";\n"
-		. "\$GLOBALS['ldap_link'] = @ldap_connect(\"$adresse_ldap\",\"$port_ldap\");\n"
-		. "@ldap_set_option(\$GLOBALS['ldap_link'],LDAP_OPT_PROTOCOL_VERSION,\"$protocole_ldap\");\n"
+	$conn = "\$GLOBALS['ldap_base'] = '$base_ldap';\n"
+		. "\$GLOBALS['ldap_link'] = @ldap_connect('$adresse_ldap','$port_ldap');\n"
+		. "@ldap_set_option(\$GLOBALS['ldap_link'],LDAP_OPT_PROTOCOL_VERSION,'$protocole_ldap');\n"
 		. (($tls_ldap != 'oui') ? '' :
 		   "@ldap_start_tls(\$GLOBALS['ldap_link']);\n")
-		. "@ldap_bind(\$GLOBALS['ldap_link'],\"$login_ldap\",\"$pass_ldap\");\n";
+		. "@ldap_bind(\$GLOBALS['ldap_link'],'$login_ldap','$pass_ldap');\n";
 
 	$champs = is_array($GLOBALS['ldap_attributes']) ? $GLOBALS['ldap_attributes'] : array();
 	$res = '';

ecrire/install/etape_sup2.php

@@ -48,9 +48,15 @@ function install_bases_sup($adresse_db, $login_db, $pass_db,  $server_db, $sup_d
 	else
 		$port = '';
 
+	$adresse_db = addslashes($adresse_db);
+	$port = addslashes($port);
+	$login_db = addslashes($login_db);
+	$pass_db = addslashes($pass_db);
+	$sup_db = addslashes($sup_db);
+	$server_db = addslashes($server_db);
 	$conn = "spip_connect_db("
-	. "'$adresse_db','$port','$login_db','"
-	. addcslashes($pass_db, "'\\") . "','$sup_db'"
+	. "'$adresse_db','$port','$login_db',"
+	. "'$pass_db','$sup_db'"
 	. ",'$server_db', '');\n";
 
 	install_fichier_connexion(_DIR_CONNECT . $sup_db . '.php', $conn);