X-Git-Url: http://git.cyclocoop.org/?p=lhc%2Fweb%2Fwww.git;a=blobdiff_plain;f=www%2Fecrire%2Finstall%2Fetape_ldap4.php;h=23223ce740250e5e999325a93de877df6024e978;hp=1582e5697e1b27aa18bfb9f025347df7b119b6e4;hb=122c920eb07e3f665789f8734965b576e6c25515;hpb=226942065cd4f604eb464addf45a065c9e5bc916

diff --git a/www/ecrire/install/etape_ldap4.php b/www/ecrire/install/etape_ldap4.php
index 1582e569..23223ce7 100644
--- a/www/ecrire/install/etape_ldap4.php
+++ b/www/ecrire/install/etape_ldap4.php
@@ -3,7 +3,7 @@
 /***************************************************************************\
  *  SPIP, Systeme de publication pour l'internet                           *
  *                                                                         *
- *  Copyright (c) 2001-2012                                                *
+ *  Copyright (c) 2001-2014                                                *
  *  Arnaud Martin, Antoine Pitrou, Philippe Riviere, Emmanuel Saint-James  *
  *                                                                         *
  *  Ce programme est un logiciel libre distribue sous licence GNU/GPL.     *
@@ -25,7 +25,7 @@ function install_etape_ldap4_dist()
 	$base_ldap_text = _request('base_ldap_text');
 	if (!$base_ldap) $base_ldap = $base_ldap_text;
 
-	echo install_debut_html();
+	echo install_debut_html('AUTO', ' onload="document.getElementById(\'suivant\').focus();return false;"');
 
 	$ldap_link = ldap_connect($adresse_ldap, $port_ldap);
 	@ldap_bind($ldap_link, $login_ldap, $pass_ldap);
@@ -38,7 +38,7 @@ function install_etape_ldap4_dist()
 		echo info_etape(_T('info_chemin_acces_annuaire')),
 			info_progression_etape(3,'etape_ldap','install/', true),
 			"<div class='error'><p><b>"._T('avis_operation_echec')."</b></p><p>"._T('avis_chemin_invalide_1'),
-			" (<tt>".htmlspecialchars($base_ldap)."</tt>) "._T('avis_chemin_invalide_2')."</p></div>";
+			" (<tt>".spip_htmlspecialchars($base_ldap)."</tt>) "._T('avis_chemin_invalide_2')."</p></div>";
 	}
 	else {
 		info_etape(_T('info_reglage_ldap'));
@@ -52,7 +52,7 @@ function install_etape_ldap4_dist()
 
 		$res = install_propager(array('adresse_ldap','port_ldap','login_ldap','pass_ldap','protocole_ldap','tls_ldap'))
 		. "<input type='hidden' name='etape' value='ldap5' />"
-		. "<input type='hidden' name='base_ldap' value='" . htmlentities($base_ldap) . "' />"
+		. "<input type='hidden' name='base_ldap' value='" . spip_htmlentities($base_ldap) . "' />"
 		. fieldset(_T('info_statut_utilisateurs_1'),
 			array(
 				'statut_ldap' => array(